diff --git a/README.md b/README.md
index 5c218aaa19..279be10799 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Please see the [contribution guide](http://definitelytyped.org/guides/contributi
 
 ## Requested definitions
 
-Here is are the [currently requested definitions](https://github.com/DefinitelyTyped/DefinitelyTyped/labels/Definition%3ARequest).
+Here are the [currently requested definitions](https://github.com/DefinitelyTyped/DefinitelyTyped/labels/Definition%3ARequest).
 
 ## License
 
diff --git a/adal-angular/adal-tests.ts b/adal-angular/adal-tests.ts
index 598134d0a0..3b9e46c961 100644
--- a/adal-angular/adal-tests.ts
+++ b/adal-angular/adal-tests.ts
@@ -12,4 +12,12 @@ var config : adal.Config = {
 
 var auth = new AuthenticationContext(config);
 
+Logging.log = (message: string) => {
+    console.log(message);
+}
+
+Logging.level = 4;
+
+auth.info("Logging message");
+
 var userName: string = auth.getCachedUser().userName;
\ No newline at end of file
diff --git a/adal-angular/adal.d.ts b/adal-angular/adal.d.ts
index c5a64efd0b..76b86e7150 100644
--- a/adal-angular/adal.d.ts
+++ b/adal-angular/adal.d.ts
@@ -4,9 +4,10 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var AuthenticationContext: adal.AuthenticationContextStatic;
+declare var Logging: adal.Logging;
 
 declare module 'adal' {
-    export = AuthenticationContext;
+    export = { AuthenticationContext, Logging };
 }
 
 declare namespace adal {
@@ -36,6 +37,18 @@ declare namespace adal {
         stateResponse: string,
         requestType: string
     }
+    
+    interface Logging {
+        log: (message: string) => void;
+        level: LoggingLevel;
+    }
+    
+    enum LoggingLevel {
+        ERROR = 0,
+        WARNING = 1, 
+        INFO = 2,
+        VERBOSE = 3
+    }
 
     interface AuthenticationContextStatic {
         new (config: Config): AuthenticationContext;
diff --git a/angular-translate/angular-translate.d.ts b/angular-translate/angular-translate.d.ts
index 045f2f5994..51946281ce 100644
--- a/angular-translate/angular-translate.d.ts
+++ b/angular-translate/angular-translate.d.ts
@@ -72,7 +72,7 @@ declare namespace angular.translate {
     }
 
     interface ITranslateProvider extends angular.IServiceProvider {
-        translations(): ITranslationTable;
+        translations(key?: string): ITranslationTable;
         translations(key: string, translationTable: ITranslationTable): ITranslateProvider;
         cloakClassName(): string;
         cloakClassName(name: string): ITranslateProvider;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index c804519727..7eaf0be763 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -869,7 +869,7 @@ angular.module('docsTabsExample', [])
 
 angular.module('componentExample', [])
     .component('counter', {
-        require: ['^ctrl'],
+        require: {'ctrl': '^ctrl'},
         bindings: {
             count: '='
         },
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index 94d6678a24..1ae64c8e45 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -156,7 +156,7 @@ declare namespace angular {
 
         noop(...args: any[]): void;
         reloadWithDebugInfo(): void;
-        toJson(obj: any, pretty?: boolean): string;
+        toJson(obj: any, pretty?: boolean | number): string;
         uppercase(str: string): string;
         version: {
             full: string;
@@ -1716,7 +1716,7 @@ declare namespace angular {
          * Whether transclusion is enabled. Enabled by default.
          */
         transclude?: boolean | string | {[slot: string]: string};
-        require?: string | string[] | {[controller: string]: string};
+        require?: {[controller: string]: string};
     }
 
     interface IComponentTemplateFn {
diff --git a/applicationinsights-js/applicationinsights-js-tests.ts b/applicationinsights-js/applicationinsights-js-tests.ts
index a852259539..b90ec6c6fe 100644
--- a/applicationinsights-js/applicationinsights-js-tests.ts
+++ b/applicationinsights-js/applicationinsights-js-tests.ts
@@ -27,7 +27,26 @@ var config: Microsoft.ApplicationInsights.IConfig = {
     cookieDomain: ""
 };
 
-var appInsights = new Microsoft.ApplicationInsights.AppInsights(config);
+var appInsights: Microsoft.ApplicationInsights.IAppInsights = {
+    config: config,
+    context: null,
+    queue: null,
+
+    startTrackPage(name?: string) { return null; },
+    stopTrackPage(name?: string, url?: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null; },
+    trackPageView(name?: string, url?: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }, duration?: number) { return null; },
+    startTrackEvent(name: string) { return null },
+    stopTrackEvent(name: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null },
+    trackEvent(name: string, properties?: { [name: string]: string; }, measurements?: { [name: string]: number; }) { return null },
+    trackAjax(id: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, method?: string) { 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 },
+    flush() { return null },
+    setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string) { return null },
+    clearAuthenticatedUserContext() { return null },
+    _onerror(message: string, url: string, lineNumber: number, columnNumber: number, error: Error) { return null }
+};
 
 // trackPageView
 appInsights.trackPageView("page1");
@@ -68,7 +87,7 @@ appInsights.config.instrumentationKey = "<new key>";
 
 
 // TelementryContext
-var context = appInsights.context;
+var context: Microsoft.ApplicationInsights.ITelemetryContext = appInsights.context;
 
 context.application.ver = "v0.0.0";
 context.application.build = "1.1.1";
@@ -89,7 +108,7 @@ context.operation.syntheticSource = "testAgent";
 
 // track
 var data = new Microsoft.Telemetry.Base();
-var envelope = new Microsoft.ApplicationInsights.Telemetry.Common.Envelope(data, "name");
+var envelope = new Microsoft.Telemetry.Envelope();
 
 context.track(envelope);
 
diff --git a/applicationinsights-js/applicationinsights-js.d.ts b/applicationinsights-js/applicationinsights-js.d.ts
index f49863b35a..5bb2a535f9 100644
--- a/applicationinsights-js/applicationinsights-js.d.ts
+++ b/applicationinsights-js/applicationinsights-js.d.ts
@@ -3,399 +3,297 @@
 // Definitions by: Kamil Szostak <https://github.com/kamilszostak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+declare module AI {
+    enum SeverityLevel {
+        Verbose = 0,
+        Information = 1,
+        Warning = 2,
+        Error = 3,
+        Critical = 4,
+    }
+}
+
 declare module Microsoft.ApplicationInsights.Context {
-    class Application {
+    interface IApplication {
         /**
          * The application version.
          */
         ver: string;
-
         /**
          * The application build version.
          */
         build: string;
     }
-
-    class Device {
+	
+	interface IDevice {
         /**
          * The type for the current device.
          */
         type: string;
-
         /**
          * A device unique ID.
          */
         id: string;
-
         /**
          * The device OEM for the current device.
          */
         oemName: string;
-
         /**
          * The device model for the current device.
          */
         model: string;
-
         /**
          * The IANA interface type for the internet connected network adapter.
          */
         network: number;
-
         /**
          * The application screen resolution.
          */
         resolution: string;
-
         /**
          * The current display language of the operating system.
          */
         locale: string;
-
         /**
          * The IP address.
          */
         ip: string;
-
         /**
          * The device language.
          */
         language: string;
-
         /**
          * The OS name.
          */
         os: string;
-
         /**
          * The OS version.
          */
         osversion: string;
-
-        /**
-         * Constructs a new instance of the Device class
-         */
-        constructor();
     }
-
-    class User {
-        /**
-         * The user ID.
-         */
-        id: string;
-
-        /**
-         * Authenticated user id
-         */
-        authenticatedId: string;
-
-        /**
-         * The account ID.
-         */
-        accountId: string;
-
-        /**
-         * The account acquisition date.
-         */
-        accountAcquisitionDate: string;
-
-        /**
-         * The user agent string.
-         */
-        agent: string;
-
-        /**
-         * The store region.
-         */
-        storeRegion: string;
-
-        /**
-        * Sets the autheticated user id and the account id in this session.
-        *
-        * @param authenticatedUserId {string} - The authenticated user id. A unique and persistent string that represents each authenticated user in the service.
-        * @param accountId {string} - An optional string to represent the account associated with the authenticated user.
-        */
-        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string): void;
-
-        /**
-         * Clears the authenticated user id and the account id from the user context.
-         * @returns {}
-         */
-        clearAuthenticatedUserContext(): void;
-
-        constructor(config: ITelemetryConfig);
-    }
-
-    class Session {
-        /**
-         * The session ID.
-         */
-        id: string;
-
-        /**
-         * The true if this is the first session
-         */
-        isFirst: boolean;
-
-        /**
-         * The date at which this guid was genereated.
-         * Per the spec the ID will be regenerated if more than acquisitionSpan milliseconds ellapse from this time.
-         */
-        acquisitionDate: number;
-
-        /**
-         * The date at which this session ID was last reported.
-         * This value should be updated whenever telemetry is sent using this ID.
-         * Per the spec the ID will be regenerated if more than renewalSpan milliseconds elapse from this time with no activity.
-         */
-        renewalDate: number;
-    }
-
-    class Location {
+	
+    interface ILocation {
         /**
          * Client IP address for reverse lookup
          */
         ip: string;
     }
 
-    class Operation {
+    interface IInternal {
         /**
-         * Unique id
+        * The SDK version used to create this telemetry item.
+        */
+        sdkVersion: string;
+        /**
+         * The SDK agent version.
+         */
+        agentVersion: string;
+    }	
+	
+    interface ISample {
+        /**
+        * Sample rate
+        */
+        sampleRate: number;
+    }
+	
+    interface ISession {
+        /**
+        * The session ID.
+        */
+        id: string;
+        /**
+         * The true if this is the first session
+         */
+        isFirst: boolean;
+        /**
+         * The date at which this guid was genereated.
+         * Per the spec the ID will be regenerated if more than acquisitionSpan milliseconds ellapse from this time.
+         */
+        acquisitionDate: number;
+        /**
+         * The date at which this session ID was last reported.
+         * This value should be updated whenever telemetry is sent using this ID.
+         * Per the spec the ID will be regenerated if more than renewalSpan milliseconds elapse from this time with no activity.
+         */
+        renewalDate: number;
+    }	
+	
+    interface IOperation {
+        /**
+         * Operation id
          */
         id: string;
-
-        name: string;
-
-        parentId: string;
-
-        rootId: string;
-
         /**
-         * String identifying the bot or test agent.
+         * Operation name
+         */
+        name: string;
+        /**
+         * Parent operation id
+         */
+        parentId: string;
+        /**
+         * Root operation id
+         */
+        rootId: string;
+        /**
+         * Synthetic source of the operation
          */
         syntheticSource: string;
     }
+	
+	interface IUser {
+        /**
+        * The telemetry configuration.
+        */
+        config: any;
+        /**
+         * The user ID.
+         */
+        id: string;
+        /**
+         * Authenticated user id
+         */
+        authenticatedId: string;
+        /**
+         * The account ID.
+         */
+        accountId: string;
+        /**
+         * The account acquisition date.
+         */
+        accountAcquisitionDate: string;
+        /**
+         * The user agent string.
+         */
+        agent: string;
+        /**
+         * The store region.
+         */
+        storeRegion: string;
+    }
 }
 
 declare module Microsoft.Telemetry {
-    export class Base {
-        public baseType: string;
-        constructor() 
+    class Base {
+        baseType: string;
+        constructor();
     }
-
-    class Envelope {
-        public ver: number;
-        public name: string;
-        public time: string;
-        public sampleRate: number;
-        public seq: string;
-        public iKey: string;
-        public flags: number;
-        public deviceId: string;
-        public os: string;
-        public osVer: string;
-        public appId: string;
-        public appVer: string;
-        public userId: string;
-        public tags: any;
-        public data: Base;
-
+	
+	class Envelope {
+        ver: number;
+        name: string;
+        time: string;
+        sampleRate: number;
+        seq: string;
+        iKey: string;
+        flags: number;
+        deviceId: string;
+        os: string;
+        osVer: string;
+        appId: string;
+        appVer: string;
+        userId: string;
+        tags: any;
+        data: Base;
         constructor();
     }
 }
 
-declare module Microsoft.ApplicationInsights.Telemetry.Common {
-    class Envelope extends Microsoft.Telemetry.Envelope  {
-        /**
-         * The data contract for serializing this object.
-         */
-        aiDataContract: any;
-
-        /**
-         * Constructs a new instance of telemetry data.
-         */
-        constructor(data: Microsoft.Telemetry.Base, name: string);
-    }
-}
-
-
 declare module Microsoft.ApplicationInsights {
-
-    var Version: string;
-
     interface IConfig {
-        // The key of your Application Insights resource in Azure
-        instrumentationKey: string;
-
-        // The Application Insights server
-        endpointUrl: string;
-
-        emitLineDelimitedJson: boolean;
-
-        accountId: string;
-
-        // A session is logged if the user is inactive for this time in milliseconds. Default 30 mins.
-        sessionRenewalMs: number;
-
-        // A session is logged if it has continued for this time in milliseconds. Default 24h.
-        sessionExpirationMs: number;
-
-        //Default 100k
-        maxBatchSizeInBytes: number;
-
-        // Default 15s
-        maxBatchInterval: number;
-
-        // If true, data is sent immediately and not batched.
-        enableDebug: boolean;
-
-        // If true, telemetry data is not collected or sent. Default false.
-        disableTelemetry: boolean;
-
-        verboseLogging: boolean;
-
-        // Default 10s:
-        diagnosticLogInterval: number;
-
-        samplingPercentage: number;
-
-        autoTrackPageVisitTime: boolean;
-
-        // If true, exceptions are not monitored. 
-        disableExceptionTracking: boolean;
-
-        // If true, ajax calls are not monitored.
-        disableAjaxTracking: boolean;
-
-        // If true, default behavior of trackPageView is changed to record end of page view duration interval when 
-        // trackPageView is called. If false and no custom duration is provided to trackPageView, the page view
-        // performance is calculated using the navigation timing API.
-        overridePageViewDuration: boolean;
-
-        // Default 500 - controls how many ajax calls will be monitored per page view.
-        // Set to -1 to monitor all ajax calls on the page.
-        maxAjaxCallsPerView: number;
-
-        disableDataLossAnalysis: boolean;
-
-        disableCorrelationHeaders: boolean;
-
-        disableFlushOnBeforeUnload: boolean;
-
-        enableSessionStorageBuffer: boolean;
-
-        // Custom cookie domain. This is helpful if you want to share Application Insights cookies across subdomains.
-        cookieDomain: string;
+        instrumentationKey?: string;
+        endpointUrl?: string;
+        emitLineDelimitedJson?: boolean;
+        accountId?: string;
+        sessionRenewalMs?: number;
+        sessionExpirationMs?: number;
+        maxBatchSizeInBytes?: number;
+        maxBatchInterval?: number;
+        enableDebug?: boolean;
+        disableExceptionTracking?: boolean;
+        disableTelemetry?: boolean;
+        verboseLogging?: boolean;
+        diagnosticLogInterval?: number;
+        samplingPercentage?: number;
+        autoTrackPageVisitTime?: boolean;
+        disableAjaxTracking?: boolean;
+        overridePageViewDuration?: boolean;
+        maxAjaxCallsPerView?: number;
+        disableDataLossAnalysis?: boolean;
+        disableCorrelationHeaders?: boolean;
+        disableFlushOnBeforeUnload?: boolean;
+        enableSessionStorageBuffer?: boolean;
+        cookieDomain?: string;
+        url?: string;
     }
 
-    interface ISenderConfig {
+    interface ITelemetryContext {
         /**
-         * The url to which payloads will be sent
-         */
-        endpointUrl: () => string;
-        /**
-        * The JSON format (normal vs line delimited). True means line delimited JSON.
+        * The object describing a component tracked by this object.
         */
-        emitLineDelimitedJson: () => boolean;
-        /**
-         * The maximum size of a batch in bytes
-         */
-        maxBatchSizeInBytes: () => number;
-        /**
-         * The maximum interval allowed between calls to batchInvoke
-         */
-        maxBatchInterval: () => number;
-        /**
-         * The master off switch.  Do not send any data if set to TRUE
-         */
-        disableTelemetry: () => boolean;
-        /**
-         * Store a copy of a send buffer in the session storage
-         */
-        enableSessionStorageBuffer: () => boolean;
-    }
-
-    interface ITelemetryConfig extends ISenderConfig {
-        instrumentationKey: () => string;
-        accountId: () => string;
-        sessionRenewalMs: () => number;
-        sessionExpirationMs: () => number;
-        sampleRate: () => number;
-        endpointUrl: () => string;
-        cookieDomain: () => string;
-    }
-
-
-    class TelemetryContext {
-        /**
-         * The object describing a component tracked by this object.
-         */
-        application: Context.Application;
-
+        application: Context.IApplication;
         /**
          * The object describing a device tracked by this object.
          */
-        device: Context.Device;
-
+        device: Context.IDevice;
         /**
-         * The object describing a user tracked by this object.
-         */
-        user: Context.User;
-
-        /**
-         * The object describing a session tracked by this object.
-         */
-        session: Context.Session;
-
+        * The object describing internal settings.
+        */
+        internal: Context.IInternal;
         /**
          * The object describing a location tracked by this object.
          */
-        location: Context.Location;
-
+        location: Context.ILocation;
         /**
          * The object describing a operation tracked by this object.
          */
-        operation: Context.Operation;
-
+        operation: Context.IOperation;
         /**
-         * Use Sender.ts to send telemetry object to the endpoint
+        * The object describing sampling settings.
+        */
+        sample: Context.ISample;
+        /**
+         * The object describing a user tracked by this object.
          */
-        track(envelope: Telemetry.Common.Envelope): Telemetry.Common.Envelope;
-
+        user: Context.IUser;
+        /**
+         * The object describing a session tracked by this object.
+         */
+        session: Context.ISession;
         /**
         * 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: Telemetry.Common.Envelope) => boolean): void;
+        addTelemetryInitializer(telemetryInitializer: (envelope: Microsoft.Telemetry.Envelope) => boolean): any;
+        /**
+        * Tracks telemetry object.
+        */
+        track(envelope: Microsoft.Telemetry.Envelope): any;
     }
 
-    /**
-     * The main API that sends telemetry to Application Insights.
-     * Learn more: http://go.microsoft.com/fwlink/?LinkID=401493
-     */
-    class AppInsights {
-        constructor(config: IConfig);
-
+    interface IAppInsights {
         config: IConfig;
-
-        context: TelemetryContext;
-
+        context: ITelemetryContext;
+        queue: (() => void)[];
         /**
-         * Starts timing how long the user views a page or other item. Call this when the page opens.
-         * This method doesn't send any telemetry. Call {@link stopTrackTelemetry} to log the page when it closes.
-         * @param   name  A string that idenfities this item, unique within this HTML document. Defaults to the document title.
-         */
-        startTrackPage(name?: string): void;
-
+        * Starts timing how long the user views a page or other item. Call this when the page opens.
+        * This method doesn't send any telemetry. Call {@link stopTrackTelemetry} to log the page when it closes.
+        * @param   name  A string that idenfities this item, unique within this HTML document. Defaults to the document title.
+        */
+        startTrackPage(name?: string): any;
         /**
-         * Logs how long a page or other item was visible, after {@link startTrackPage}. Call this when the page closes.
-         * @param   name  The string you used as the name in startTrackPage. Defaults to the document title.
-         * @param   url   String - a relative or absolute URL that identifies the page or other item. Defaults to the window location.
-         * @param   properties  map[string, string] - additional data used to filter pages and metrics in the portal. Defaults to empty.
-         * @param   measurements    map[string, number] - metrics associated with this page, displayed in Metrics Explorer on the portal. Defaults to empty.
-         */
-        stopTrackPage(name?: string, url?: string, properties?: Object, measurements?: Object): void;
-
+        * Logs how long a page or other item was visible, after {@link startTrackPage}. Call this when the page closes.
+        * @param   name  The string you used as the name in startTrackPage. Defaults to the document title.
+        * @param   url   String - a relative or absolute URL that identifies the page or other item. Defaults to the window location.
+        * @param   properties  map[string, string] - additional data used to filter pages and metrics in the portal. Defaults to empty.
+        * @param   measurements    map[string, number] - metrics associated with this page, displayed in Metrics Explorer on the portal. Defaults to empty.
+        */
+        stopTrackPage(name?: string, url?: string, properties?: {
+            [name: string]: string;
+        }, measurements?: {
+            [name: string]: number;
+        }): any;
         /**
          * Logs that a page or other item was viewed.
          * @param   name  The string you used as the name in startTrackPage. Defaults to the document title.
@@ -404,39 +302,61 @@ declare module Microsoft.ApplicationInsights {
          * @param   measurements    map[string, number] - metrics associated with this page, displayed in Metrics Explorer on the portal. Defaults to empty.
          * @param   duration    number - the number of milliseconds it took to load the page. Defaults to undefined. If set to default value, page load time is calculated internally.
          */
-        trackPageView(name?: string, url?: string, properties?: Object, measurements?: Object, duration?: number): void;
-
+        trackPageView(name?: string, url?: string, properties?: {
+            [name: string]: string;
+        }, measurements?: {
+            [name: string]: number;
+        }, duration?: number): any;
         /**
          * Start timing an extended event. Call {@link stopTrackEvent} to log the event when it ends.
          * @param   name    A string that identifies this event uniquely within the document.
          */
-        startTrackEvent(name: string): void;
-
+        startTrackEvent(name: string): any;
         /**
          * Log an extended event that you started timing with {@link startTrackEvent}.
          * @param   name    The string you used to identify this event in startTrackEvent.
          * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
          * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
          */
-        stopTrackEvent(name: string, properties?: Object, measurements?: Object): void;
-
+        stopTrackEvent(name: string, properties?: {
+            [name: string]: string;
+        }, measurements?: {
+            [name: string]: number;
+        }): any;
         /**
-         * Log a user action or other occurrence.
-         * @param   name    A string to identify this event in the portal.
-         * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
-         * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
-         */
-        trackEvent(name: string, properties?: Object, measurements?: Object): void;
-
-        trackAjax(id: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, method?: string): void;
-
+        * Log a user action or other occurrence.
+        * @param   name    A string to identify this event in the portal.
+        * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
+        * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
+        */
+        trackEvent(name: string, properties?: {
+            [name: string]: string;
+        }, measurements?: {
+            [name: string]: number;
+        }): any;
+        /**
+        * Log an AJAX request
+        * @param  id  Event id
+        * @param  absoluteUrl Full url
+        * @param  pathName Leave this parameter blank
+        * @param  totalTime Total time it took for AJAX request to complete
+        * @param  success Whether AJAX request succeeded or failed
+        * @param  resultCode Result code returned from AJAX call
+        * @param  method  HTTP verb that was used (GET, POST)
+        */
+        trackAjax(id: string, absoluteUrl: string, pathName: string, totalTime: number, success: boolean, resultCode: number, method?: string): any;
         /**
          * Log an exception you have caught.
          * @param   exception   An Error from a catch clause, or the string error message.
          * @param   properties  map[string, string] - additional data used to filter events and metrics in the portal. Defaults to empty.
          * @param   measurements    map[string, number] - metrics associated with this event, displayed in Metrics Explorer on the portal. Defaults to empty.
+         * @param   severityLevel   AI.SeverityLevel - severity level
          */
-        trackException(exception: Error, handledAt?: string, properties?: Object, measurements?: Object): void;
+        trackException(exception: Error, handledAt?: string, properties?: {
+            [name: string]: string;
+        }, measurements?: {
+            [name: string]: number;
+        }, severityLevel?: AI.SeverityLevel): any;
         /**
          * Log a numeric value that is not associated with a specific event. Typically used to send regular reports of performance indicators.
          * To send a single measurement, use just the first two parameters. If you take measurements very frequently, you can reduce the
@@ -447,34 +367,34 @@ declare module Microsoft.ApplicationInsights {
          * @param   min The smallest measurement in the sample. Defaults to the average.
          * @param   max The largest measurement in the sample. Defaults to the average.
          */
-        trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: Object): void;
-
+        trackMetric(name: string, average: number, sampleCount?: number, min?: number, max?: number, properties?: {
+            [name: string]: string;
+        }): any;
         /**
         * Log a diagnostic message.
         * @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?: Object): void;
-
+        trackTrace(message: string, properties?: {
+            [name: string]: string;
+        }): any;
         /**
          * Immediately send all queued telemetry.
          */
-        flush(): void;
-
+        flush(): any;
         /**
-         * Sets the autheticated user id and the account id in this session.
-         * User auth id and account id should be of type string. They should not contain commas, semi-colons, equal signs, spaces, or vertical-bars.
-         *
-         * @param authenticatedUserId {string} - The authenticated user id. A unique and persistent string that represents each authenticated user in the service.
-         * @param accountId {string} - An optional string to represent the account associated with the authenticated user.
-         */
-        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string): void;
-
+        * Sets the autheticated user id and the account id in this session.
+        * User auth id and account id should be of type string. They should not contain commas, semi-colons, equal signs, spaces, or vertical-bars.
+        *
+        * @param authenticatedUserId {string} - The authenticated user id. A unique and persistent string that represents each authenticated user in the service.
+        * @param accountId {string} - An optional string to represent the account associated with the authenticated user.
+        */
+        setAuthenticatedUserContext(authenticatedUserId: string, accountId?: string): any;
         /**
          * Clears the authenticated user id and the account id from the user context.
          */
-        clearAuthenticatedUserContext(): void;
-
+        clearAuthenticatedUserContext(): any;
+        downloadAndSetup?(config: Microsoft.ApplicationInsights.IConfig): void;
         /**
          * The custom error handler for Application Insights
          * @param {string} message - The error message
@@ -483,6 +403,6 @@ declare module Microsoft.ApplicationInsights {
          * @param {number} columnNumber - The column number for the line where the error was raised
          * @param {Error}  error - The Error object
          */
-        _onerror(message: string, url: string, lineNumber: number, columnNumber: number, error: Error): void;
+        _onerror(message: string, url: string, lineNumber: number, columnNumber: number, error: Error): any;
     }
 }
diff --git a/base64-js/base64-js-tests.ts b/base64-js/base64-js-tests.ts
new file mode 100644
index 0000000000..6852ddb626
--- /dev/null
+++ b/base64-js/base64-js-tests.ts
@@ -0,0 +1,6 @@
+/// <reference path="base64-js.d.ts" />
+
+import * as base64js from 'base64-js';
+
+const bytes: Uint8Array = base64js.toByteArray('shemp');
+const decoded: string = base64js.fromByteArray(new Uint8Array(0));
diff --git a/base64-js/base64-js.d.ts b/base64-js/base64-js.d.ts
new file mode 100644
index 0000000000..cc7d2165c8
--- /dev/null
+++ b/base64-js/base64-js.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for base64-js v1.1.2
+// Project: https://github.com/beatgammit/base64-js
+// Definitions by: Peter Safranek <https://github.com/pe8ter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'base64-js' {
+
+    export function toByteArray(encoded: string): Uint8Array;
+    export function fromByteArray(bytes: Uint8Array): string;
+}
diff --git a/bingmaps/Microsoft.Maps.d.ts b/bingmaps/Microsoft.Maps.d.ts
index 95e39a043e..1e7e464930 100644
--- a/bingmaps/Microsoft.Maps.d.ts
+++ b/bingmaps/Microsoft.Maps.d.ts
@@ -174,6 +174,7 @@ declare namespace Microsoft.Maps {
         fixedMapPosition?: boolean;
         height?: number;
         inertiaIntensity?: number;
+        navigationBarMode?: number;
         showBreadcrumb?: boolean;
         showCopyright?: boolean;
         showDashboard?: boolean;
@@ -216,6 +217,12 @@ declare namespace Microsoft.Maps {
         getY(): number;
     }
 
+    export enum NavigationBarMode {
+        default,
+        compact,
+        minified
+    }
+
     export enum PixelReference {
         control,
         page,
@@ -307,6 +314,7 @@ declare namespace Microsoft.Maps {
         getZIndex(): number;
         setHtmlContent(content: string): void;
         setLocation(location: Location): void;
+        setMap(map: Map): void;
         setOptions(options: InfoboxOptions): void;
         toString(): string;
     }
diff --git a/body-parser/body-parser.d.ts b/body-parser/body-parser.d.ts
index 16f639dfaf..f7e691a365 100644
--- a/body-parser/body-parser.d.ts
+++ b/body-parser/body-parser.d.ts
@@ -33,7 +33,7 @@ declare module "body-parser" {
         /**
          * passed to JSON.parse().
          */
-        receiver?: (key: string, value: any) => any;
+        reviver?: (key: string, value: any) => any;
         /**
          * parse extended syntax with the qs module. (default: true)
          */
@@ -65,7 +65,7 @@ declare module "body-parser" {
             /**
              * passed to JSON.parse().
              */
-            receiver?: (key: string, value: any) => any;
+            reviver?: (key: string, value: any) => any;
         }): express.RequestHandler;
 
         export function raw(options?: {
diff --git a/bootstrap.datepicker/bootstrap.datepicker.d.ts b/bootstrap.datepicker/bootstrap.datepicker.d.ts
index 686cc6b423..f60a0ffed6 100644
--- a/bootstrap.datepicker/bootstrap.datepicker.d.ts
+++ b/bootstrap.datepicker/bootstrap.datepicker.d.ts
@@ -15,7 +15,7 @@
  *  http://bootstrap-datepicker.readthedocs.org/en/release/options.html
  */
 interface DatepickerOptions {
-    format?: string;
+    format?: string | DatepickerCustomFormatOptions;
     weekStart?: number;
     startDate?: any;
     endDate?: any;
@@ -38,6 +38,11 @@ interface DatepickerOptions {
     assumeNearbyYear?: any;
 }
 
+interface DatepickerCustomFormatOptions {
+    toDisplay?(date: string, format: any, language: any): string;
+    toValue?(date: string, format: any, language: any): Date;
+}
+
 interface DatepickerEventObject extends JQueryEventObject {
     date: Date;
     format(format?: string): string;
diff --git a/bootstrap/bootstrap-tests.ts b/bootstrap/bootstrap-tests.ts
index c497e0abcd..f7cfdeab43 100644
--- a/bootstrap/bootstrap-tests.ts
+++ b/bootstrap/bootstrap-tests.ts
@@ -44,3 +44,8 @@ $('.typeahead').typeahead({
 });
 
 $('#navbar').affix();
+
+$('.item').emulateTransitionEnd(2000);
+
+$.support.transition = false;
+console.log(($.support.transition as TransitionEventNames).end === "transitionend");
diff --git a/bootstrap/bootstrap.d.ts b/bootstrap/bootstrap.d.ts
index b0e8fbf858..ae84454332 100644
--- a/bootstrap/bootstrap.d.ts
+++ b/bootstrap/bootstrap.d.ts
@@ -53,7 +53,7 @@ interface PopoverOptions {
 }
 
 interface CollapseOptions {
-    parent?: any;    
+    parent?: any;
     toggle?: boolean;
 }
 
@@ -79,6 +79,10 @@ interface AffixOptions {
     target?: any;
 }
 
+interface TransitionEventNames {
+    end: string;
+}
+
 interface JQuery {
     modal(options?: ModalOptions): JQuery;
     modal(options?: ModalOptionsBackdropString): JQuery;
@@ -114,6 +118,12 @@ interface JQuery {
     typeahead(options?: TypeaheadOptions): JQuery;
 
     affix(options?: AffixOptions): JQuery;
+
+    emulateTransitionEnd(duration: number): JQuery;
+}
+
+interface JQuerySupport {
+    transition: boolean | TransitionEventNames;
 }
 
 declare module "bootstrap" {
diff --git a/browser-pack/browser-pack-tests.ts b/browser-pack/browser-pack-tests.ts
new file mode 100644
index 0000000000..4cf20249e8
--- /dev/null
+++ b/browser-pack/browser-pack-tests.ts
@@ -0,0 +1,33 @@
+/// <reference path="browser-pack.d.ts" />
+
+import browserPack = require("browser-pack");
+
+module BrowserPackTest {
+
+    export function packIt(opts?: BrowserPack.Options) {
+        var packOpts: BrowserPack.Options = {
+            basedir: opts.basedir || "./",
+            externalRequireName: opts.externalRequireName || "require",
+            hasExports: opts.hasExports || false,
+            prelude: opts.prelude || undefined,
+            preludePath: opts.preludePath || undefined,
+            raw: opts.raw || false,
+            sourceMapPrefix: opts.sourceMapPrefix || '//#',
+            standalone: opts.standalone || undefined,
+            standaloneModule: opts.standaloneModule || undefined,
+        };
+
+        var res = browserPack(); // 'opts' are optional
+        var res2 = browserPack(packOpts);
+
+        // ensure return value is a stream
+        var res3 = res.pipe(res2);
+
+        res.on("error", function (err: any) {
+            console.error("browser-pack error: ", err);
+        });
+    }
+
+}
+
+export = BrowserPackTest;
\ No newline at end of file
diff --git a/browser-pack/browser-pack.d.ts b/browser-pack/browser-pack.d.ts
new file mode 100644
index 0000000000..52b96ce134
--- /dev/null
+++ b/browser-pack/browser-pack.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for browser-pack v6.0.1
+// Project: https://github.com/substack/browser-pack
+// Definitions by: TeamworkGuy2 <https://github.com/TeamworkGuy2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+/** pack node-style source files from a json stream into a browser bundle
+ */
+declare module BrowserPack {
+
+    export interface Options {
+        /** Whether the bundle should include require= (or the opts.externalRequireName) so that
+         * require() is available outside the bundle
+         */
+        hasExports?: boolean;
+
+        /** A string to use in place of 'require' if opts.hasExports is specified, default is 'require'
+         */
+        externalRequireName?: string;
+
+        /** Specify a custom prelude, but know what you're doing first. See the prelude.js file in
+         * this repo for the default prelude. If you specify a custom prelude, you must also specify
+         * a valid opts.preludePath to the prelude source file for sourcemaps to work
+         */
+        prelude?: string;
+
+        /** prelude.js path if a custom opts.prelude is specified
+         */
+        preludePath?: string;
+
+        /** Used if opts.preludePath is undefined, this is used to resolve the prelude.js file location, default: 'process.cwd()'
+         */
+        basedir?: string;
+
+        /** if given, the writable end of the stream will expect objects to be written to
+         * it instead of expecting a stream of json text it will need to parse, default false
+         */
+        raw?: boolean;
+
+        /** External string name to use for UMD, if not provided, UMD declaration is not wrapped around output
+         */
+        standalone?: string;
+
+        /** Sets the internal module name to export for standalone
+         */
+        standaloneModule?: string;
+
+        /** If given and source maps are computed, the opts.sourceMapPrefix string will be used instead of default: '//#'
+         */
+        sourceMapPrefix?: string;
+    }
+
+}
+
+declare module "browser-pack" {
+    /** pack node-style source files from a json stream into a browser bundle
+     */
+    function browserPack(opts?: BrowserPack.Options): NodeJS.ReadWriteStream;
+    export = browserPack;
+}
\ No newline at end of file
diff --git a/chartist/chartist.d.ts b/chartist/chartist.d.ts
index 6c679dc1d8..0e92364812 100644
--- a/chartist/chartist.d.ts
+++ b/chartist/chartist.d.ts
@@ -105,7 +105,7 @@ declare namespace Chartist {
     plugins?: Array<any>; // all of these plugins seem to be functions with options, but keeping type any for now
 
     update(data: Object, options?: T, override?: boolean): void;
-    detatch(): void;
+    detach(): void;
 
     /**
      * Use this function to register event handlers. The handler callbacks are synchronous and will run in the main thread rather than the event loop.
diff --git a/ckeditor/ckeditor.d.ts b/ckeditor/ckeditor.d.ts
index bba377090f..9d8728338f 100644
--- a/ckeditor/ckeditor.d.ts
+++ b/ckeditor/ckeditor.d.ts
@@ -641,7 +641,7 @@ declare namespace CKEDITOR {
         filebrowserImageBrowseLinkUrl?: string;
         filebrowserImageBrowseUrl?: string;
         filebrowserImageUploadUrl?: string;
-        filebrowserUploadUr?: string;
+        filebrowserUploadUrl?: string;
         filebrowserWindowFeatures?: string;
         filebrowserWindowHeight?: number | string;
         filebrowserWindowWidth?: number | string;
diff --git a/codemirror/codemirror.d.ts b/codemirror/codemirror.d.ts
index f513057216..b1bf33e2d2 100644
--- a/codemirror/codemirror.d.ts
+++ b/codemirror/codemirror.d.ts
@@ -220,14 +220,7 @@ declare namespace CodeMirror {
 
         /** Get an { left , top , width , height , clientWidth , clientHeight } object that represents the current scroll position, the size of the scrollable area,
         and the size of the visible area(minus scrollbars). */
-        getScrollInfo(): {
-            left: any;
-            top: any;
-            width: any;
-            height: any;
-            clientWidth: any;
-            clientHeight: any;
-        }
+        getScrollInfo(): CodeMirror.ScrollInfo;
 
         /** Scrolls the given element into view. pos is a { line , ch } position, referring to a given character, null, to refer to the cursor.
         The margin parameter is optional. When given, it indicates the amount of pixels around the given area that should be made visible as well. */
@@ -609,6 +602,15 @@ declare namespace CodeMirror {
         text: string;
     }
 
+    interface ScrollInfo {
+        left: any;
+        top: any;
+        width: any;
+        height: any;
+        clientWidth: any;
+        clientHeight: any;
+    }
+
     interface TextMarker {
         /** Remove the mark. */
         clear(): void;
diff --git a/common-tags/common-tags-tests.ts b/common-tags/common-tags-tests.ts
new file mode 100644
index 0000000000..9114f4414c
--- /dev/null
+++ b/common-tags/common-tags-tests.ts
@@ -0,0 +1,156 @@
+/// <reference path="common-tags.d.ts" />
+
+import * as commonTags from 'common-tags';
+
+/* Test Built-in Tags */
+
+commonTags.commaLists `
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commonTags.commaListsAnd`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commonTags.commaListsOr`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+let fruits = ['apple', 'orange', 'watermelon'];
+
+commonTags.html`
+  <div class="list">
+    <ul>
+      ${fruits.map(fruit => `<li>${fruit}</li>`)}
+      ${'<li>kiwi</li>\n<li>guava</li>'}
+    </ul>
+  </div>
+`;
+
+commonTags.codeBlock`
+  <div class="list">
+    <ul>
+      ${fruits.map(fruit => `<li>${fruit}</li>`)}
+      ${'<li>kiwi</li>\n<li>guava</li>'}
+    </ul>
+  </div>
+`;
+
+commonTags.source`
+  <div class="list">
+    <ul>
+      ${fruits.map(fruit => `<li>${fruit}</li>`)}
+      ${'<li>kiwi</li>\n<li>guava</li>'}
+    </ul>
+  </div>
+`;
+
+commonTags.oneLine`
+  foo
+  bar
+  baz
+`;
+
+commonTags.oneLineTrim`
+  https://news.com/article
+  ?utm_source=designernews.co
+`;
+
+commonTags.oneLineCommaLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commonTags.oneLineCommaListsOr`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commonTags.oneLineCommaListsAnd`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commonTags.inlineLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+commonTags.oneLineInlineLists`
+  I like ${['apples', 'bananas', 'watermelons']}
+  They're good!
+`;
+
+let verb = 'notice';
+
+commonTags.stripIndent`
+  This is a multi-line string.
+  You'll ${verb} that it is indented.
+  We don't want to output this indentation.
+    But we do want to keep this line indented.
+`;
+
+commonTags.stripIndents`
+  This is a multi-line string.
+  You'll ${verb} that it is indented.
+  We don't want to output this indentation.
+    We don't want to keep this line indented either.
+`;
+
+/* Test Tag Constructor */
+
+new commonTags.TemplateTag();
+
+const substitutionReplacer = (oldValue : string, newValue : string) => ({
+    onSubstitution(substitution : string, resultSoFar : string) {
+        if (substitution === oldValue) {
+            return newValue;
+        }
+        return substitution;
+    }
+});
+
+new commonTags.TemplateTag(substitutionReplacer('fizz', 'buzz'));
+
+new commonTags.TemplateTag(
+    substitutionReplacer('fizz', 'buzz'),
+    substitutionReplacer('foo', 'bar')
+);
+
+new commonTags.TemplateTag([
+    substitutionReplacer('fizz', 'buzz'),
+    substitutionReplacer('foo', 'bar')
+]);
+
+new commonTags.TemplateTag({});
+
+new commonTags.TemplateTag({
+    onEndResult: endResult => `${endResult}!`
+});
+
+new commonTags.TemplateTag({
+    onSubstitution: substitution => `${substitution}!`,
+    onEndResult: endResult => `${endResult}!`
+});
+
+/* Tests Built-in Transformers */
+
+new commonTags.TemplateTag(commonTags.trimResultTransformer());
+new commonTags.TemplateTag(commonTags.trimResultTransformer('left'));
+new commonTags.TemplateTag(commonTags.trimResultTransformer('right'));
+
+new commonTags.TemplateTag(commonTags.stripIndentTransformer());
+new commonTags.TemplateTag(commonTags.stripIndentTransformer('initial'));
+new commonTags.TemplateTag(commonTags.stripIndentTransformer('all'));
+
+new commonTags.TemplateTag(commonTags.replaceResultTransformer('foo', 'bar'));
+
+new commonTags.TemplateTag(commonTags.inlineArrayTransformer());
+new commonTags.TemplateTag(commonTags.inlineArrayTransformer({}));
+new commonTags.TemplateTag(commonTags.inlineArrayTransformer({separator: 'foo'}));
+new commonTags.TemplateTag(commonTags.inlineArrayTransformer({conjunction: 'bar'}));
+
+new commonTags.TemplateTag(commonTags.splitStringTransformer('foo'));
diff --git a/common-tags/common-tags.d.ts b/common-tags/common-tags.d.ts
new file mode 100644
index 0000000000..aa443ac33d
--- /dev/null
+++ b/common-tags/common-tags.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for common-tags v1.2.1
+// Project: https://github.com/declandewet/common-tags
+// Definitions by: Viktor Zozuliak <https://github.com/zuzusik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'common-tags' {
+    type TemplateTag = (literals: string[], ...placeholders: any[]) => string;
+
+    type TemplateTransformer = {
+        onSubstitution?: (substitution: string, resultSoFar: string) => string;
+        onEndResult?: (endResult : string) => string;
+    }
+
+    /* Built-in Tags */
+    export var commaLists: TemplateTag;
+
+    export var commaListsAnd: TemplateTag;
+
+    export var commaListsOr: TemplateTag;
+
+    export var html: TemplateTag;
+
+    export var codeBlock: TemplateTag;
+
+    export var source: TemplateTag;
+
+    export var oneLine: TemplateTag;
+
+    export var oneLineTrim: TemplateTag;
+
+    export var oneLineCommaLists: TemplateTag;
+
+    export var oneLineCommaListsOr: TemplateTag;
+
+    export var oneLineCommaListsAnd: TemplateTag;
+
+    export var inlineLists: TemplateTag;
+
+    export var oneLineInlineLists: TemplateTag;
+
+    export var stripIndent: TemplateTag;
+
+    export var stripIndents: TemplateTag;
+
+    /* New Tag Constructor */
+    export var TemplateTag: {
+        new(): TemplateTag;
+        new(...transformers: TemplateTransformer[]): TemplateTag;
+        new(transformers: TemplateTransformer[]): TemplateTag;
+    };
+
+    /* Built-in Transformers */
+    export var trimResultTransformer: (side?: 'left'|'right') => TemplateTransformer;
+
+    export var stripIndentTransformer: (type?: 'initial'|'all') => TemplateTransformer;
+
+    export var replaceResultTransformer: (replaceWhat: string, replaceWith: string) => TemplateTransformer;
+
+    export var inlineArrayTransformer: (opts?: {separator?: string, conjunction?: string}) => TemplateTransformer;
+
+    export var splitStringTransformer: (splitBy: string) => TemplateTransformer;
+}
diff --git a/component-emitter/component-emitter-tests.ts b/component-emitter/component-emitter-tests.ts
new file mode 100644
index 0000000000..e6c6a5b1ab
--- /dev/null
+++ b/component-emitter/component-emitter-tests.ts
@@ -0,0 +1,52 @@
+/// <reference path='../node/node.d.ts' />   // only for require
+/// <reference path='component-emitter.d.ts' />
+// These are all of the examples from https://www.npmjs.com/package/component-emitter as of June 18, 2016
+
+
+// These are all of the examples from https://www.npmjs.com/package/component-emitter as of June 18, 2016
+
+var Emitter = require('component-emitter');
+var emitter = new Emitter;
+emitter.emit('something');
+
+
+
+
+var user = { name: 'tobi' };
+Emitter(user);
+
+(<Emitter>user).emit('im a user');
+
+
+
+// this example modified from the one on https://www.npmjs.com/package/component-emitter
+var User = Object.create({
+    someUserFunction: () => {console.log('someUserFunction called!')}
+})
+var another_user = Emitter(User);
+another_user.someUserFunction()
+another_user.on('hi', () => {console.log('Hi called')})
+another_user.emit('hi')
+
+
+// Additional sample code for this test
+function handleSomeRecurringEvent(event_data: any) {
+    console.log('handle some-recurring-event')
+}
+emitter.on('some-recurring-event', handleSomeRecurringEvent)
+
+
+emitter.once('some-single-shot-event', (event_data: any) => {console.log('handle some-single-shot-event')})
+
+
+emitter.off()
+emitter.off('some-recurring-event')
+emitter.off('some-recurring-event', handleSomeRecurringEvent)
+
+var event_data = {some: 'data'}
+emitter.emit('some-recurring-event')
+emitter.emit('some-recurring-event', event_data)
+
+emitter.listeners('some-recurring-event')
+
+emitter.hasListeners('some-recurring-event')
diff --git a/component-emitter/component-emitter.d.ts b/component-emitter/component-emitter.d.ts
new file mode 100644
index 0000000000..28ce4f4bc9
--- /dev/null
+++ b/component-emitter/component-emitter.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for component-emitter v1.2.1
+// Project: https://www.npmjs.com/package/component-emitter
+// Definitions by: Peter Snider <https://github.com/psnider/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/emitter-component
+
+
+interface Emitter {
+    (obj?: Object): Emitter;
+    on(event: string, listener: Function): Emitter;
+    once(event: string, listener: Function): Emitter;
+    off(event?: string, listener?: Function): Emitter;
+    emit(event: string, ...args: any[]): boolean;
+    listeners(event: string): Function[];
+    hasListeners(event: string): boolean;
+}
+
+declare module 'component-emitter' {
+    var Emitter: Emitter;
+}
diff --git a/cucumber/cucumber.d.ts b/cucumber/cucumber.d.ts
index d0e742d9c2..6c4273e4e0 100644
--- a/cucumber/cucumber.d.ts
+++ b/cucumber/cucumber.d.ts
@@ -29,8 +29,20 @@ declare namespace cucumber {
 	}
 
 	interface HookScenario{
-		attach(text: string, mimeType?: string, callback?: (err?:any) => void): void;
-		isFailed() : boolean;
+		getKeyword():string;
+		getName():string;
+		getDescription():string;
+		getUri():string;
+		getLine():number;
+		getTags():string[];
+		getException():Error;
+		getAttachments():any[];
+		attach(data:any, mimeType?:string, callback?:(err?:any) => void):void;
+		isSuccessful():boolean;
+		isFailed():boolean;
+		isPending():boolean;
+		isUndefined():boolean;
+		isSkipped():boolean;
 	}
 
 	interface HookCode {
diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index 683fb8532c..b35d898522 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -292,17 +292,17 @@ declare namespace d3 {
              */
             datum(): Datum;
 
-            /**
-             * Set the data item for each node in the selection.
-             * @param value the constant element to use for each node
-             */
-            datum<NewDatum>(value: NewDatum): Update<NewDatum>;
-
             /**
              * Derive the data item for each node in the selection. Useful for situations such as the HTML5 'dataset' attribute.
              * @param value the function to compute data for each node
              */
             datum<NewDatum>(value: (datum: Datum, index: number, outerIndex: number) => NewDatum): Update<NewDatum>;
+            
+            /**
+             * Set the data item for each node in the selection.
+             * @param value the constant element to use for each node
+             */
+            datum<NewDatum>(value: NewDatum): Update<NewDatum>;
 
             /**
              * Reorders nodes in the selection based on the given comparator. Nodes are re-inserted into the document once sorted.
@@ -1111,8 +1111,7 @@ declare namespace d3 {
     export function deviation(array: number[]): number;
     export function deviation<T>(array: T[], accessor: (datum: T, index: number) => number): number;
 
-    export function bisectLeft(array: number[], x: number, lo?: number, hi?: number): number;
-    export function bisectLeft(array: string[], x: string, lo?: number, hi?: number): number;
+    export function bisectLeft<T>(array: T[], x: T, lo?: number, hi?: number): number;
 
     export var bisect: typeof bisectRight;
 
@@ -3064,6 +3063,8 @@ declare namespace d3 {
         }
 
         export interface Partition<T extends partition.Node> {
+            (root: T): T[];
+
             nodes(root: T): T[];
 
             links(nodes: T[]): partition.Link<T>[];
diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
new file mode 100644
index 0000000000..1b8d2a24f9
--- /dev/null
+++ b/d3kit/d3kit-tests.ts
@@ -0,0 +1,1112 @@
+/// <reference path="d3kit.d.ts" />
+/// <reference path="../d3/d3.d.ts" />
+/// <reference path="../mocha/mocha.d.ts" />
+/// <reference path="../chai/chai.d.ts" />
+
+/* jshint expr: true */
+
+var expect = chai.expect;
+describe('Skeleton', function(){
+    var element: Element, $element: d3.Selection<any>, $svg: d3.Selection<any>, skeleton: d3kit.Skeleton;
+
+    beforeEach(function(done){
+      element = document.body.appendChild(document.createElement('div')) as Element;
+      skeleton = new d3kit.Skeleton(element, null, ['custom1', 'custom2']);
+      $element = d3.select(element);
+      $svg = $element.select('svg');
+      done();
+    });
+
+    describe('new Skeleton()', function(){
+      it('should create <svg> inside the element', function(){
+        expect($element.select('svg').size()).to.be.equal(1);
+      });
+      it('should create <g> inside <svg> inside the element', function(){
+        expect($element.select('svg').select('g').size()).to.be.equal(1);
+      });
+    });
+
+    describe('#getCustomEventNames()', function(){
+      it('should return custom event names', function(){
+        expect(skeleton.getCustomEventNames()).to.deep.equal(['custom1', 'custom2']);
+      });
+    });
+
+    describe('#getDispatcher()', function(){
+      it('should return event dispatcher', function(){
+        expect(skeleton.getDispatcher()).to.be.an('Object');
+        expect(skeleton.getDispatcher().data).to.be.a('Function');
+      });
+    });
+
+    describe('#getInnerWidth()', function(){
+      it('should return width of the skeleton excluding margin', function(){
+        skeleton.options({
+          margin: {left: 10, right: 10}
+        });
+        skeleton.width(100);
+        expect(skeleton.getInnerWidth()).to.equal(80);
+      });
+    });
+
+    describe('#getInnerHeight()', function(){
+      it('should return height of the skeleton excluding margin', function(){
+        skeleton.options({
+          margin: {top: 10, bottom: 20}
+        });
+        skeleton.height(100);
+        expect(skeleton.getInnerHeight()).to.equal(70);
+      });
+    });
+
+    describe('#getLayerOrganizer()', function(){
+      it('should return the LayerOrganizer', function(){
+        expect(skeleton.getLayerOrganizer()).to.be.an('Object');
+      });
+    });
+
+    describe('#getRootG()', function(){
+      it('should return d3 selection of the root <g>', function(){
+        var g = skeleton.getRootG();
+        expect(g.size()).to.equal(1);
+        expect((g[0][0] as Element).tagName).to.equal('g');
+      });
+    });
+
+    describe('#getSvg()', function(){
+      it('should return d3 selection of the <svg>', function(){
+        var svg = skeleton.getSvg();
+        expect(svg.size()).to.equal(1);
+        expect((svg[0][0] as Element).tagName).to.equal('svg');
+      });
+    });
+
+    describe('#data(data, doNotDispatch)', function(){
+      it('should return data when called without argument', function(){
+        skeleton.data({a: 1});
+        expect(skeleton.data()).to.deep.equal({a: 1});
+      });
+      it('should set data when called with at least one argument', function(){
+        skeleton.data('test');
+        expect(skeleton.data()).to.equal('test');
+      });
+      it('after setting, should dispatch "data" event', function(done){
+        skeleton.on('data.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.data({a: 1});
+      });
+      it('after setting, should not dispatch "data" event if doNotDispatch is true', function(done){
+        skeleton.on('data.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.data({a: 1}, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#options(options, doNotDispatch)', function(){
+      it('should return options when called without argument', function(){
+        skeleton.options({a: 2});
+        expect(skeleton.options()).to.include.keys(['a']);
+        expect(skeleton.options().a).to.equal(2);
+      });
+      it('should set options when called with at least one argument', function(){
+        skeleton.options({a: 1});
+        expect(skeleton.options()).to.include.keys(['a']);
+        expect(skeleton.options().a).to.equal(1);
+      });
+      it('should not overwrite but extend existing options when setting', function(){
+        skeleton.options({a: 1});
+        skeleton.options({b: 2});
+        expect(skeleton.options()).to.include.keys(['a', 'b']);
+        expect(skeleton.options().a).to.equal(1);
+        expect(skeleton.options().b).to.equal(2);
+      });
+      it('after setting, should dispatch "options" event', function(done){
+        skeleton.on('options.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.options({a: 1});
+      });
+      it('after setting, should not dispatch "options" event if doNotDispatch is true', function(done){
+        skeleton.on('options.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.options({a: 1}, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#margin(margin, doNotDispatch)', function(){
+      it('should return margin when called without argument', function(){
+        var margin = {left: 10, right: 10, top: 10, bottom: 10};
+        skeleton.margin(margin);
+        expect(skeleton.margin()).to.deep.equal(margin);
+      });
+      it('should set margin when called with at least one argument', function(){
+        var margin = {left: 10, right: 10, top: 10, bottom: 10};
+        skeleton.margin(margin);
+
+        skeleton.margin({left: 20});
+        expect(skeleton.margin().left).to.equal(20);
+        expect(skeleton.margin().right).to.equal(10);
+        skeleton.margin({right: 20});
+        expect(skeleton.margin().right).to.equal(20);
+        skeleton.margin({top: 20});
+        expect(skeleton.margin().top).to.equal(20);
+        skeleton.margin({bottom: 20});
+        expect(skeleton.margin().bottom).to.equal(20);
+      });
+      it('should update innerWidth after setting margin', function(){
+        skeleton.width(100);
+        skeleton.margin({left: 10, right:10});
+        expect(skeleton.getInnerWidth()).to.equal(80);
+        skeleton.margin({left: 15, right:15});
+        expect(skeleton.getInnerWidth()).to.equal(70);
+      });
+      it('should update innerHeight after setting margin', function(){
+        skeleton.height(100);
+        skeleton.margin({top: 10, bottom:10});
+        expect(skeleton.getInnerHeight()).to.equal(80);
+        skeleton.margin({top: 15, bottom:15});
+        expect(skeleton.getInnerHeight()).to.equal(70);
+      });
+      it('should update the root <g> transform/translate', function(){
+        skeleton.margin({left: 30, top: 30});
+        skeleton.offset([0.5, 0.5]);
+        skeleton.margin({left: 10, top: 10});
+        var translate = skeleton.getRootG().attr('transform');
+        expect(translate).to.equal('translate(10.5,10.5)');
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.margin({left: 33});
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.margin({left: 33}, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#offset(offset)', function(){
+      it('should return offset when called without argument', function(){
+        var offset = [1,1];
+        skeleton.offset(offset);
+        expect(skeleton.offset()).to.deep.equal(offset);
+      });
+      it('should set offset when called with at least one argument', function(){
+        var offset = [1,1];
+        skeleton.offset(offset);
+        skeleton.offset([2,3]);
+        expect(skeleton.offset()).to.deep.equal([2,3]);
+      });
+      it('should update the root <g> transform/translate', function(){
+        skeleton.offset([0.5, 0.5]);
+        skeleton.margin({left: 10, top: 10});
+        skeleton.offset([2,3]);
+        var translate = skeleton.getRootG().attr('transform');
+        expect(translate).to.equal('translate(12,13)');
+      });
+    });
+
+    describe('#width(width, doNotDispatch)', function(){
+      it('should return <svg> width when called without argument', function(){
+        var w = $svg.attr('width');
+        expect(skeleton.width()).to.equal(+w);
+      });
+      it('should set <svg> width when called with Number as the first argument', function(){
+        skeleton.width(300);
+        expect(+$svg.attr('width')).to.equal(300);
+      });
+      it('should set <svg> width when called with a Number and "px" such as "100px" as the first argument', function(){
+        skeleton.width('299px');
+        expect(+$svg.attr('width')).to.equal(299);
+      });
+      it('should set <svg> width to container\'s width when called with "auto" as the first argument', function(){
+        var w = element.clientWidth;
+        skeleton.width('auto');
+        expect(+$svg.attr('width')).to.equal(w);
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.width(200);
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.width(200, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#height(height, doNotDispatch)', function(){
+      it('should return <svg> height when called without argument', function(){
+        var w = $svg.attr('height');
+        expect(skeleton.height()).to.equal(+w);
+      });
+      it('should set <svg> height when called with Number as the first argument', function(){
+        skeleton.height(300);
+        expect(+$svg.attr('height')).to.equal(300);
+      });
+      it('should set <svg> height when called with a Number and "px" such as "100px" as the first argument', function(){
+        skeleton.height('299px');
+        expect(+$svg.attr('height')).to.equal(299);
+      });
+      it('should set <svg> height to container\'s height when called with "auto" as the first argument', function(){
+        var w = element.clientHeight;
+        skeleton.height('auto');
+        expect(+$svg.attr('height')).to.equal(w);
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.height(200);
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.height(200, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#dimension(dimension, doNotDispatch)', function(){
+      it('should return an array [width, height] when called without argument', function(){
+        var dim = [+$svg.attr('width'), +$svg.attr('height')];
+        expect(skeleton.dimension()).to.deep.equal(dim);
+      });
+      it('should set width and height of the <svg> when called with an array [width, height] as the first argument', function(){
+        skeleton.dimension([118, 118]);
+        expect([+$svg.attr('width'), +$svg.attr('height')]).to.deep.equal([118, 118]);
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.dimension([150, 150]);
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.dimension([150, 150], true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#hasData()', function(){
+      it('should return true when data are not null nor undefined', function(){
+        skeleton.data({});
+        expect(skeleton.hasData()).to.be.true;
+        skeleton.data({test: 1});
+        expect(skeleton.hasData()).to.be.true;
+        skeleton.data([]);
+        expect(skeleton.hasData()).to.be.true;
+        skeleton.data(['test']);
+        expect(skeleton.hasData()).to.be.true;
+      });
+      it('should return false when data are null or undefined', function(){
+        skeleton.data(null);
+        expect(skeleton.hasData()).to.be.false;
+        skeleton.data(undefined);
+        expect(skeleton.hasData()).to.be.false;
+      });
+    });
+
+    describe('#hasNonZeroArea()', function(){
+      it('should return true if <svg>\'s width & height excluding margin is more than zero', function(){
+        skeleton.options({
+          margin: {left: 10, right: 10}
+        });
+        skeleton.width(80);
+        skeleton.options({
+          margin: {top: 10, bottom: 20}
+        });
+        skeleton.height(50);
+        expect(skeleton.hasNonZeroArea()).to.be.true;
+      });
+      it('should return false otherwise', function(){
+        skeleton.options({
+          margin: {left: 10, right: 10}
+        });
+        skeleton.width(20);
+        skeleton.options({
+          margin: {top: 10, bottom: 20}
+        });
+        skeleton.height(30);
+        expect(skeleton.hasNonZeroArea()).to.be.false;
+      });
+    });
+
+    describe('#mixin({})', function(){
+      it('should extend this skeleton with new fields/functions', function(){
+        skeleton.mixin({
+          a: 1,
+          b: 2
+        });
+        expect(skeleton).to.include.keys(['a', 'b']);
+        expect((<any>skeleton).a).to.equal(1);
+        expect((<any>skeleton).b).to.equal(2);
+      });
+      it('should overwrite existing fields', function(){
+        skeleton.mixin({
+          b: 2
+        });
+        skeleton.mixin({
+          b: 3
+        });
+        expect(skeleton).to.include.keys(['b']);
+        expect((<any>skeleton).b).to.equal(3);
+      });
+      it('should keep original fields if not overwritten', function(){
+        skeleton.mixin({
+          a: 1,
+          b: 2
+        });
+        skeleton.mixin({
+          c: 20,
+          b: 3
+        });
+        expect(skeleton).to.include.keys(['a', 'b', 'c']);
+        expect((<any>skeleton).a).to.equal(1);
+        expect((<any>skeleton).b).to.equal(3);
+        expect((<any>skeleton).c).to.equal(20);
+      });
+    });
+
+    describe('#resizeToFitContainer(mode)', function(){
+      it('when mode is "all" should resize to fit both width and height', function(){
+        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
+        var w = element.clientWidth;
+        var h = element.clientHeight;
+        skeleton.resizeToFitContainer('all');
+        expect(skeleton.dimension()).to.deep.equal([w, h]);
+      });
+      it('when mode is "both" should resize to fit both width and height', function(){
+        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
+        var w = element.clientWidth;
+        var h = element.clientHeight;
+        skeleton.resizeToFitContainer('both');
+        expect(skeleton.dimension()).to.deep.equal([w, h]);
+      });
+      it('when mode is "full" should resize to fit both width and height', function(){
+        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
+        var w = element.clientWidth;
+        var h = element.clientHeight;
+        skeleton.resizeToFitContainer('full');
+        expect(skeleton.dimension()).to.deep.equal([w, h]);
+      });
+      it('when mode is "width" should resize width to fit container but keep original height', function(){
+        var w1 = element.clientWidth/2;
+        var h1 = element.clientHeight/2;
+
+        skeleton.dimension([w1, h1]);
+
+        var w2 = element.clientWidth;
+        var h2 = element.clientHeight;
+
+        skeleton.resizeToFitContainer('width');
+
+        expect(skeleton.width()).to.equal(Math.floor(w2));
+        expect(skeleton.height()).to.equal(Math.floor(h1));
+        expect(skeleton.width()).to.not.equal(w1);
+        expect(skeleton.height()).to.not.equal(h2);
+      });
+      it('when mode is "height" should resize height to fit container but keep original width', function(){
+        var w1 = element.clientWidth/2;
+        var h1 = element.clientHeight*2;
+
+        skeleton.dimension([w1, h1]);
+
+        var w2 = element.clientWidth;
+        var h2 = element.clientHeight;
+
+        skeleton.resizeToFitContainer('height');
+
+        expect(skeleton.width()).to.equal(Math.floor(w1));
+        expect(skeleton.height()).to.equal(Math.floor(h2));
+        expect(skeleton.width()).to.not.equal(w2);
+        expect(skeleton.height()).to.not.equal(h1);
+      });
+    });
+
+    describe('#resizeToAspectRatio(ratio)', function(){
+      // todo
+    });
+
+    describe('#autoResize(mode)', function(){
+      it('should return current mode when called without argument', function(){
+        skeleton.autoResize(false);
+        expect(skeleton.autoResize()).to.be.false;
+        skeleton.autoResize('width');
+        expect(skeleton.autoResize()).to.equal('width');
+      });
+      it('should enable auto resize when set mode to "width/height/both/etc.", similar to parameters of resizeToFitContainer()', function(done){
+        // set initial size
+        skeleton.width(50);
+        skeleton.autoResize('width');
+        setTimeout(function(){
+          expect(skeleton.width()).to.equal(element.clientWidth);
+          done();
+        }, 500);
+      });
+      it('should disable auto resize when set mode to false', function(done){
+        // set initial size
+        skeleton.width(50);
+        skeleton.autoResize('width');
+        setTimeout(function(){
+          expect(skeleton.width()).to.equal(element.clientWidth);
+          // disable resize and
+          skeleton.autoResize(false);
+          skeleton.width(50);
+          setTimeout(function(){
+            expect(skeleton.width()).to.not.equal(element.clientWidth);
+            done();
+          }, 500);
+        }, 500);
+      });
+    });
+
+    describe('#autoResizeDetection(detection)', function(){
+      // todo
+    });
+
+    describe('#autoResizeToAspectRatio(ratio)', function(){
+      // todo
+    });
+
+
+});
+
+describe.only('LayerOrganizer', function(){
+
+  describe('new LayerOrganizer(container) will create layers as <g> by default', function(){
+    var container: d3.Selection<any>, layers: d3kit.LayerOrganizer;
+    before(function(done){
+      container = d3.select('body').append('svg').append('g');
+      layers = new d3kit.LayerOrganizer(container);
+      done();
+    });
+
+    describe('#create(names)', function(){
+      it('should create single layer given a String', function(){
+        layers.create('single');
+        expect(container.select('g.single-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple layers given an array', function(){
+        layers.create(['a', 'b', 'c']);
+        expect(container.select('g.a-layer').size()).to.be.equal(1);
+        expect(container.select('g.b-layer').size()).to.be.equal(1);
+        expect(container.select('g.c-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with a String inside', function(){
+        layers.create({d: 'e'});
+        expect(container.select('g.d-layer').size()).to.be.equal(1);
+        expect(container.select('g.d-layer g.e-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with an Array inside', function(){
+        layers.create({f: ['g', 'h']});
+        expect(container.select('g.f-layer').size()).to.be.equal(1);
+        expect(container.select('g.f-layer g.g-layer').size()).to.be.equal(1);
+        expect(container.select('g.f-layer g.h-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple nested layers given an array of objects', function(){
+        layers.create([{'i': ['x']}, {'j': 'x'}, {'k': ['x','y']}]);
+        expect(container.select('g.i-layer').size()).to.be.equal(1);
+        expect(container.select('g.j-layer').size()).to.be.equal(1);
+        expect(container.select('g.k-layer').size()).to.be.equal(1);
+        expect(container.select('g.i-layer g.x-layer').size()).to.be.equal(1);
+        expect(container.select('g.i-layer g.x-layer').size()).to.be.equal(1);
+        expect(container.select('g.k-layer g.x-layer').size()).to.be.equal(1);
+        expect(container.select('g.k-layer g.y-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multi-level nested layers given a nested plain Object', function(){
+        layers.create({
+          l: [
+            'm',
+            {'n': [
+              {'o': ['p']}, 'q'
+            ]}
+          ]
+        });
+        expect(container.select('g.l-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.m-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer g.o-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer g.o-layer g.p-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer g.q-layer').size()).to.be.equal(1);
+      });
+
+    });
+
+    describe('#has(name)', function(){
+      it('should be able to check first-level layer', function(){
+        expect(layers.has('single')).to.be.true;
+        expect(layers.has('test')).to.be.false;
+      });
+      it('should be able to check second-level layer', function(){
+        expect(layers.has('l.m')).to.be.true;
+        expect(layers.has('l.x')).to.be.false;
+      });
+      it('should be able to check third-level layer', function(){
+        expect(layers.has('l.n.q')).to.be.true;
+        expect(layers.has('l.n.x')).to.be.false;
+      });
+    });
+
+    describe('#get(name)', function(){
+      it('should be able to get first-level layer', function(){
+        expect(layers.get('single')).to.exist;
+        expect(layers.get('test')).to.be.not.exist;
+      });
+      it('should be able to get second-level layer', function(){
+        expect(layers.get('l.m')).to.exist;
+        expect(layers.get('l.x')).to.not.exist;
+      });
+      it('should be able to get third-level layer', function(){
+        expect(layers.get('l.n.o')).to.exist;
+        expect(layers.get('l.n.x')).to.not.exist;
+      });
+    });
+  });
+
+  describe('new LayerOrganizer(container, tag) will create layers with the given tag instead of <g>', function(){
+    var container: d3.Selection<any>, layers: d3kit.LayerOrganizer;
+    before(function(done){
+      container = d3.select('body').append('div');
+      layers = new d3kit.LayerOrganizer(container, 'div');
+      done();
+    });
+
+    describe('#create(names)', function(){
+      it('should create single layer given a String', function(){
+        layers.create('single');
+        expect(container.select('div.single-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple layers given an array', function(){
+        layers.create(['a', 'b', 'c']);
+        expect(container.select('div.a-layer').size()).to.be.equal(1);
+        expect(container.select('div.b-layer').size()).to.be.equal(1);
+        expect(container.select('div.c-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with a String inside', function(){
+        layers.create({d: 'e'});
+        expect(container.select('div.d-layer').size()).to.be.equal(1);
+        expect(container.select('div.d-layer div.e-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with an Array inside', function(){
+        layers.create({f: ['g', 'h']});
+        expect(container.select('div.f-layer').size()).to.be.equal(1);
+        expect(container.select('div.f-layer div.g-layer').size()).to.be.equal(1);
+        expect(container.select('div.f-layer div.h-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple nested layers given an array of objects', function(){
+        layers.create([{'i': ['x']}, {'j': 'x'}, {'k': ['x','y']}]);
+        expect(container.select('div.i-layer').size()).to.be.equal(1);
+        expect(container.select('div.j-layer').size()).to.be.equal(1);
+        expect(container.select('div.k-layer').size()).to.be.equal(1);
+        expect(container.select('div.i-layer div.x-layer').size()).to.be.equal(1);
+        expect(container.select('div.i-layer div.x-layer').size()).to.be.equal(1);
+        expect(container.select('div.k-layer div.x-layer').size()).to.be.equal(1);
+        expect(container.select('div.k-layer div.y-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multi-level nested layers given a nested plain Object', function(){
+        layers.create({
+          l: [
+            'm',
+            {'n': [
+              {'o': ['p']}, 'q'
+            ]}
+          ]
+        });
+        expect(container.select('div.l-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.m-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer div.o-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer div.o-layer div.p-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer div.q-layer').size()).to.be.equal(1);
+      });
+
+    });
+
+    describe('#has(name)', function(){
+      it('should be able to check first-level layer', function(){
+        expect(layers.has('single')).to.be.true;
+        expect(layers.has('test')).to.be.false;
+      });
+      it('should be able to check second-level layer', function(){
+        expect(layers.has('l.m')).to.be.true;
+        expect(layers.has('l.x')).to.be.false;
+      });
+      it('should be able to check third-level layer', function(){
+        expect(layers.has('l.n.q')).to.be.true;
+        expect(layers.has('l.n.x')).to.be.false;
+      });
+    });
+
+    describe('#get(name)', function(){
+      it('should be able to get first-level layer', function(){
+        expect(layers.get('single')).to.exist;
+        expect(layers.get('test')).to.be.not.exist;
+      });
+      it('should be able to get second-level layer', function(){
+        expect(layers.get('l.m')).to.exist;
+        expect(layers.get('l.x')).to.not.exist;
+      });
+      it('should be able to get third-level layer', function(){
+        expect(layers.get('l.n.o')).to.exist;
+        expect(layers.get('l.n.x')).to.not.exist;
+      });
+    });
+  });
+
+});
+
+describe('Chartlet', function(){
+  interface ConfigureFunction {
+      (parent: d3kit.Chartlet, child: d3kit.Chartlet): void;
+  }
+  var enter: d3kit.ChartletEventFunction, update: d3kit.ChartletEventFunction, exit: d3kit.ChartletEventFunction, chartlet: d3kit.Chartlet;
+  var customEvents: Array<string> = ['fooEvent'];
+  var ChildChartlet: () => d3kit.Chartlet;
+  var ParentChartlet: (configureFunction: ConfigureFunction) => d3kit.Chartlet;
+
+  var callback = function(selection?: d3.Selection<any>, done?: any) { return (sel: d3.Selection<any>) => {done();};};
+  beforeEach(function(done){
+    ChildChartlet = function() {
+      var chartlet = new d3kit.Chartlet(callback, callback, callback);
+      (<any>chartlet).runTest = function (testFunction: any) {
+        testFunction(chartlet);
+      };
+      return chartlet;
+    };
+
+    ParentChartlet = function(configureFunction: ConfigureFunction) {
+      var chartlet = new d3kit.Chartlet(callback, callback, callback);
+      var child = ChildChartlet();
+      configureFunction(chartlet, child);
+      (<any>chartlet).runTest = (<any>child).runTest;
+      return chartlet;
+    };
+
+    enter  = callback;
+    update = callback;
+    exit   = callback;
+    chartlet = new d3kit.Chartlet(enter, update, exit, customEvents);
+    done();
+  });
+
+  describe('new Chartlet(enter, update, exit, customEvents)', function(){
+    it('should create a chartlet', function(){
+      expect(chartlet).to.be.an('Object');
+      expect(chartlet).to.include.keys(['property', 'on']);
+      expect(chartlet.enter).to.be.a('Function');
+      expect(chartlet.update).to.be.a('Function');
+      expect(chartlet.exit).to.be.a('Function');
+      expect(function(){ chartlet.enter(); }).to.not.throw(Error);
+      expect(function(){ chartlet.update(); }).to.not.throw(Error);
+      expect(function(){ chartlet.exit(); }).to.not.throw(Error);
+      expect(chartlet.getCustomEventNames()).to.deep.equal(customEvents);
+    });
+    it('arguments "update", "exit" and "customEvents" are optional', function(){
+      var comp = new d3kit.Chartlet(enter);
+      expect(comp).to.be.an('Object');
+      expect(comp).to.include.keys(['property', 'on']);
+      expect(comp.enter).to.be.a('Function');
+      expect(comp.update).to.be.a('Function');
+      expect(comp.exit).to.be.a('Function');
+      expect(function(){ comp.enter(); }).to.not.throw(Error);
+      expect(function(){ comp.update(); }).to.not.throw(Error);
+      expect(function(){ comp.exit(); }).to.not.throw(Error);
+    });
+  });
+
+  describe('#getDispatcher()', function(){
+    it('should return a dispatcher', function(){
+      var dispatcher = chartlet.getDispatcher();
+      expect(dispatcher).to.exist;
+    });
+    it('returned dispatcher should handle enter/update/exit events', function(){
+      var dispatcher = chartlet.getDispatcher();
+      expect(dispatcher).to.include.keys(['enterDone', 'updateDone', 'exitDone'].concat(customEvents));
+    });
+  });
+
+  describe('#getPropertyValue(name, d, i)', function(){
+    it('should return computed value for specified property name, d and i', function(){
+      var d = {a: 99};
+      var i = 2;
+
+      chartlet.property('foo', 1);
+      chartlet.property('bar', 'two');
+      chartlet.property('baz', function(d:{a:number}, i: number) {return 3;});
+      chartlet.property('qux', function(d:{a:number}, i: number) {return 'four';});
+      chartlet.property('nux', function(d:{a:number}, i: number) {return d.a * i;});
+
+      expect(chartlet.getPropertyValue('foo', d, i)).to.equal(1);
+      expect(chartlet.getPropertyValue('bar', d, i)).to.equal('two');
+      expect(chartlet.getPropertyValue('baz', d, i)).to.equal(3);
+      expect(chartlet.getPropertyValue('qux', d, i)).to.equal('four');
+      expect(chartlet.getPropertyValue('nux', d, i)).to.equal(198);
+    });
+  });
+
+  describe('#property(name, valueOrFn)', function(){
+    describe('should act as a getter when called with one argument', function(){
+      it('should always return a function', function(){
+        chartlet.property('foo', 1);
+        expect(chartlet.property('foo')).to.be.a('Function');
+        chartlet.property('bar', function(){ return 100; });
+        expect(chartlet.property('bar')).to.be.a('Function');
+      });
+      it('should return a function that return undefined for unknown property name', function(){
+        expect(chartlet.property('unknown name')).to.be.a('Function');
+        expect(chartlet.property('unknown name')()).to.equal(undefined);
+      });
+    });
+
+    describe('should act as a setter when called with two arguments', function(){
+      it('should set specified property to a functor of given value', function(){
+        chartlet.property('foo', 1);
+        expect(chartlet.property('foo')).to.be.a('Function');
+        expect(chartlet.property('foo')()).to.equal(1);
+        chartlet.property('bar', function(){ return 100; });
+        expect(chartlet.property('bar')).to.be.a('Function');
+        expect(chartlet.property('bar')()).to.equal(100);
+      });
+      it('should overwrite previous value when set property with the same name', function(){
+        chartlet.property('foo', 1);
+        expect(chartlet.property('foo')()).to.equal(1);
+        chartlet.property('foo', 100);
+        expect(chartlet.property('foo')()).to.equal(100);
+      });
+    });
+  });
+
+  describe('#on(eventName, listener)', function(){
+    it('event "enterDone" should be triggered after chartlet.enter() is completed.', function(done){
+      chartlet.on('enterDone', function(){ return (sel: d3.Selection<any>) => {done();} });
+      chartlet.enter();
+    });
+    it('event "updateDone" should be triggered after chartlet.update() is completed.', function(done){
+      chartlet.on('updateDone', function(){ return (sel: d3.Selection<any>) => {done();} });
+      chartlet.update();
+    });
+    it('event "exitDone" should be triggered after chartlet.exit() is completed.', function(done){
+      chartlet.on('exitDone', function(){ return (sel: d3.Selection<any>) => {done();} });
+      chartlet.exit();
+    });
+  });
+
+  describe('#inheritPropertyFrom(parentChartlet, parentPropertyName, childPropertyName)', function(){
+    it('it should cause a child to inherit a parent property', function() {
+      var parent = ParentChartlet(function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertyFrom(parent, 'foo', 'bar');
+        })
+        .property('foo', function(d:number) {return 2 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('bar', 4, 0)).to.be.equal(8);
+      });
+    });
+
+    it('it should default to the parent property name', function() {
+      var parent = ParentChartlet(
+        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertyFrom(parent, 'foo');
+        })
+        .property('foo', function(d:number) {return 2 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('foo', 4, 0)).to.be.equal(8);
+      });
+    });
+  });
+
+  describe('#inheritProperties(parentChartlet, parentPropertyNames, childPropertyNames)', function(){
+    it('it should cause a child to inherit many parent properties', function() {
+      var parent = ParentChartlet(
+        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertiesFrom(parent, ['foo', 'bar', 'baz'], ['foo-x', 'bar-x', 'baz-x']);
+        })
+        .property('foo', function(d:number) {return 2 * d;})
+        .property('bar', function(d:number) {return 3 * d;})
+        .property('baz', function(d:number) {return 4 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('foo-x', 1, 0)).to.be.equal(2);
+        expect(child.getPropertyValue('bar-x', 1, 0)).to.be.equal(3);
+        expect(child.getPropertyValue('baz-x', 1, 0)).to.be.equal(4);
+      });
+    });
+
+    it('it should default to the parent property names', function() {
+      var parent = ParentChartlet(
+        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertiesFrom(parent, ['foo', 'bar', 'baz']);
+        })
+        .property('foo', function(d:number) {return 2 * d;})
+        .property('bar', function(d:number) {return 3 * d;})
+        .property('baz', function(d:number) {return 4 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('foo', 1, 0)).to.be.equal(2);
+        expect(child.getPropertyValue('bar', 1, 0)).to.be.equal(3);
+        expect(child.getPropertyValue('baz', 1, 0)).to.be.equal(4);
+      });
+    });
+  });
+
+  describe('#publishEventsTo(foreignDispatcher)', function(){
+    it('should map events to a foreignDispatcher', function(done) {
+
+      var parent = new d3kit.Chartlet(callback, callback, callback, ['foo']);
+      parent.getDispatcher().on('foo', function(value:number) {
+        expect(value).to.be.equal(99);
+        done();
+      });
+
+      var child = new d3kit.Chartlet(callback, callback, callback, ['foo'])
+        .publishEventsTo(parent.getDispatcher());
+
+      (<any>child.getDispatcher()).foo(99);
+    });
+  });
+});
+
+describe('#createChart', function(){
+  var Chart = d3kit.factory.createChart({}, ['test'], function(skeleton: d3kit.Skeleton){
+    return skeleton;
+  });
+
+  it('should return a function to create a chart', function(){
+    expect(Chart).to.be.a('Function');
+  });
+
+  // // Don't think it's possible to define these in a d.ts file; skipping
+  // it('results should have function getCustomEvents()', function(){
+  //   expect(Chart.getCustomEvents).to.exist;
+  //   expect(Chart.getCustomEvents()).to.deep.equal(['test']);
+  // });
+});
+
+describe('d3kit.helper', function(){
+
+  describe('#dasherize(str)', function(){
+    it('should convert input to dash-case', function(){
+      expect(d3kit.helper.dasherize('camelCase')).to.equal('camel-case');
+    });
+  });
+
+  describe('#deepExtend(target, src1, src2, ...)', function(){
+    it('should copy fields from sources into target', function(){
+      expect(d3kit.helper.deepExtend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      })).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+
+      expect(d3kit.helper.deepExtend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      }, null)).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+    });
+
+    it('should copy arrays and functions correctly from sources into target', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.deepExtend({}, {
+        a: fn1,
+        b: [1,2]
+      },{
+        b: [3,4],
+        c: fn2
+      })).to.deep.equal({
+        a: fn1,
+        b: [3,4],
+        c: fn2
+      });
+    });
+
+    it('should perform "deep" copy', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.deepExtend({}, {
+        a: { d: fn1 },
+        b: [1,2],
+        c: { f: 3 },
+        h: { i: [1,2,3], j: [3,4,5] }
+      },{
+        a: { e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
+      })).to.deep.equal({
+        a: { d: fn1, e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], j: [3,4,5], k: [3,4,5], l: {m: 2} }
+      });
+    });
+  });
+
+  describe('#extend(target, src1, src2, ...)', function(){
+    it('should copy fields from sources into target', function(){
+      expect(d3kit.helper.extend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      })).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+
+      expect(d3kit.helper.extend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      }, null)).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+    });
+
+    it('should copy arrays and functions correctly from sources into target', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.extend({}, {
+        a: fn1,
+        b: [1,2]
+      },{
+        b: [3,4],
+        c: fn2
+      })).to.deep.equal({
+        a: fn1,
+        b: [3,4],
+        c: fn2
+      });
+    });
+
+    it('should NOT perform "deep" copy', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.extend({}, {
+        a: { d: fn1 },
+        b: [1,2],
+        c: { f: 3 },
+        h: { i: [1,2,3], j: [3,4,5] }
+      },{
+        a: { e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
+      })).to.deep.equal({
+        a: { e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
+      });
+    });
+  });
+
+  describe('#isFunction(function)', function(){
+    it('should return true if the value is a function', function(){
+      var fn1 = function(d:number){return d + 1;};
+      function fn2(d:number){return d + 2;}
+
+      expect(d3kit.helper.isFunction(fn1)).to.be.true;
+      expect(d3kit.helper.isFunction(fn2)).to.be.true;
+    });
+    it('should return false if the value is not a function', function(){
+      expect(d3kit.helper.isFunction(0)).to.be.false;
+      expect(d3kit.helper.isFunction(1)).to.be.false;
+      expect(d3kit.helper.isFunction(true)).to.be.false;
+      expect(d3kit.helper.isFunction('what')).to.be.false;
+      expect(d3kit.helper.isFunction(null)).to.be.false;
+      expect(d3kit.helper.isFunction(undefined)).to.be.false;
+    });
+  });
+
+  describe('#isNumber(value)', function(){
+    it('should return true for number', function(){
+      expect(d3kit.helper.isNumber(1)).to.be.true;
+      expect(d3kit.helper.isNumber(0)).to.be.true;
+      expect(d3kit.helper.isNumber(-1)).to.be.true;
+    });
+    it('should return false for string even if it is a number', function(){
+      expect(d3kit.helper.isNumber('')).to.be.false;
+      expect(d3kit.helper.isNumber('1')).to.be.false;
+      expect(d3kit.helper.isNumber('0')).to.be.false;
+      expect(d3kit.helper.isNumber('what')).to.be.false;
+    });
+    it('should return false for null and undefined', function(){
+      expect(d3kit.helper.isNumber(null)).to.be.false;
+      expect(d3kit.helper.isNumber(undefined)).to.be.false;
+    });
+  });
+});
+
diff --git a/d3kit/d3kit.d.ts b/d3kit/d3kit.d.ts
new file mode 100644
index 0000000000..4e53472b7b
--- /dev/null
+++ b/d3kit/d3kit.d.ts
@@ -0,0 +1,155 @@
+// Type definitions for d3Kit v1.1.0
+// Project: https://www.npmjs.com/package/d3kit
+// Definitions by: Morgan Benton <https://github.com/morphatic/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../d3/d3.d.ts" />
+
+declare namespace d3kit {
+
+    export interface ChartMargin {
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number;
+    }
+
+    export interface ChartOptions {
+        margin?: ChartMargin;
+        offset?: [number,number];
+        initialWidth?: number;
+        initialHeight?: number;
+        [name: string]: any;
+    }
+
+    export interface ChartMixin {
+        [name: string]: any;
+    }
+
+    export class Skeleton {
+
+        constructor(selector: string|Element, options?: ChartOptions, customEvents?: Array<string>);
+        
+        // Getters
+        getCustomEventNames(): Array<string>;
+        getDispatcher(): any; // should be d3.Dispatch but this throws error for user-created events
+        getInnerWidth(): number;
+        getInnerHeight(): number;
+        getLayerOrganizer(): LayerOrganizer;
+        getRootG(): d3.Selection<any>;
+        getSvg(): d3.Selection<any>;
+
+        // Getter/Setters
+        data(): any;
+        data(data?: any, doNotDispatch?: boolean): Skeleton;
+        options(): any; // wish this could be ChartOptions
+        options(options: ChartOptions, doNotDispatch?: boolean): Skeleton;
+        margin(): ChartMargin;
+        margin(margin: ChartMargin, doNotDispatch?: boolean): Skeleton;
+        offset(): [number, number];
+        offset(offset: Array<number>, doNotDispatch?: boolean): Skeleton;
+        width(): number;
+        width(value: number|string, doNotDispatch?: boolean): Skeleton;
+        height(): number;
+        height(value: number|string, doNotDispatch?: boolean): Skeleton;
+        dimension(): [number, number];
+        dimension(dimension: [number|string, number|string], doNotDispatch?: boolean): Skeleton;
+        autoResize(mode?: string|boolean): string|boolean|void;
+        autoResizeDetection(method?:string): string|void;
+        autoResizeToAspectRatio(ratio?: number|boolean): number|boolean|void;
+
+        // Other functions
+        on(eventName: string, listener: (...args: Array<any>) => void): void;
+        hasData(): boolean;
+        hasNonZeroArea(): boolean;
+        mixin(fn: ChartMixin): void;
+        resizeToFitContainer(mode: string|boolean, doNotDispatch?: boolean): void;
+        resizeToAspectRatio(ratio: number, doNotDispatch?: boolean): void;
+    }
+
+    interface ChartletPropertyCallback {
+        (datum?: any, datum_index?: number): any;
+    }
+
+    export interface ChartletEventFunction {
+        (sel?: d3.Selection<any>, done?: string): (sel: d3.Selection<any>) => void;
+    }
+
+    export class Chartlet {
+
+        constructor(
+            enterFunction?:   ChartletEventFunction, 
+            updateFunction?:  ChartletEventFunction, 
+            exitFunction?:    ChartletEventFunction, 
+            customEventName?: Array<string>);
+
+        // Getter functions
+        getDispatcher(): d3.Dispatch;
+        getCustomEventNames(): Array<string>;
+        getPropertyValue(name: string, datum: any, datum_index: number): any;
+
+        // Getter/Setter functions
+        property(name: string): ChartletPropertyCallback;
+        property(name: string, value: any): Chartlet;
+
+        // Enter/Update/Exit functions
+        enter( sel?: d3.Selection<any>, done?: string): (sel: d3.Selection<any>) => void;
+        update(sel?: d3.Selection<any>, done?: string): (sel: d3.Selection<any>) => void;
+        exit(  sel?: d3.Selection<any>, done?: string): (sel: d3.Selection<any>) => void;
+
+        // Inheritance functions
+        inheritPropertyFrom(parent_chartlet: Chartlet, parent_property_name: string, child_property_name?: string): void;
+        inheritPropertiesFrom(parent_chartlet: Chartlet, parent_property_names: Array<string>, child_property_names?: Array<string>): void;
+        publishEventsTo(dispatcher: d3.Dispatch): Chartlet;
+
+        // Events
+        on(eventName: string, handlerFunction: ChartletEventFunction): void;
+    }
+
+    interface LayerConfig {
+        name?: string,
+        names?: Array<string>,
+        sublayers?: LayerConfig
+    }
+
+    export class LayerOrganizer {
+
+        constructor(container: d3.Selection<any>, tag?: string);
+
+        create(config: string|Array<string>|LayerConfig|Array<LayerConfig>): d3.Selection<any>|Array<d3.Selection<any>>;
+        get(name: string): d3.Selection<any>;
+        has(name: string): boolean;
+    }
+
+    export namespace factory {
+        export function createChart(
+            defaultOptions: ChartOptions, 
+            customEvents: Array<string>, 
+            constructor: (skeleton: Skeleton) => void
+        ): (selector: string|Element, options?: ChartOptions, customEvents?: Array<string>) => Skeleton;
+    }
+
+    export namespace helper {
+        export function debounce(fn: (...args: Array<any>) => void, wait: number, immediate: boolean): (...args: Array<any>) => void;
+        export function extend(target: Object, ...args: Object[]): Object;
+        export function deepExtend(target: Object, ...args: Object[]): Object;
+        export function bindMouseEventsToDispatcher(selection: d3.Selection<any>, dispatch: d3.Dispatch, prefix: string): void;
+        export function removeAllChildren(selection: d3.Selection<any>, noTransition: boolean): d3.Selection<any>;
+        export function on(element: Element, type: string, listener: (...args: Array<any>) => void): void;
+        export function off(element: Element, type: string, listener: (...args: Array<any>) => void): void;
+        export function trim(str: string, characters: string): string;
+        export function dasherize(str: string): string;
+        export function $(s: Element|string): Element;
+        export function $$(s: Array<Node>|NodeList): Array<Element>;
+        export function isArray(value: any): boolean;
+        export function isNumber(value: any): boolean;
+        export function isObject(value: any): boolean;
+        export function isElement(o: any): boolean;
+        export function isFunction(functionToCheck: any): boolean;
+    }
+
+}
+
+declare module 'd3kit' {
+    export = d3kit;
+}
\ No newline at end of file
diff --git a/d3pie/d3pie-tests.ts b/d3pie/d3pie-tests.ts
new file mode 100644
index 0000000000..4d8a38280f
--- /dev/null
+++ b/d3pie/d3pie-tests.ts
@@ -0,0 +1,146 @@
+/// <reference path='d3pie.d.ts' />
+
+let chart = new d3pie('test',
+  {
+    header: {
+      title: {
+        text: '',
+        color: '#333333',
+        fontSize: 18,
+        font: 'arial'
+      },
+      subtitle: {
+        color: '#666666',
+        fontSize: 14,
+        font: 'arial'
+      },
+      location: 'top-center',
+      titleSubtitlePadding: 8
+    },
+    footer: {
+      text: '',
+      color: '#666666',
+      fontSize: 14,
+      font: 'arial',
+      location: 'left'
+    },
+    size: {
+      canvasHeight: 500,
+      canvasWidth: 500,
+      pieInnerRadius: 0,
+      pieOuterRadius: null
+    },
+    data: {
+      sortOrder: 'none',
+      smallSegmentGrouping: {
+        enabled: false,
+        value: 1,
+        valueType: 'percentage',
+        label: 'Other',
+        color: '#cccccc'
+      },
+      content: []
+    },
+    labels: {
+      outer: {
+        format: 'label',
+        hideWhenLessThanPercentage: null,
+        pieDistance: 30
+      },
+      inner: {
+        format: 'percentage',
+        hideWhenLessThanPercentage: null
+      },
+      mainLabel: {
+        color: '#333333',
+        font: 'arial',
+        fontSize: 10
+      },
+      percentage: {
+        color: '#dddddd',
+        font: 'arial',
+        fontSize: 10,
+        decimalPlaces: 0
+      },
+      value: {
+        color: '#cccc44',
+        font: 'arial',
+        fontSize: 10
+      },
+      lines: {
+        enabled: true,
+        style: 'curved',
+        color: 'segment' // 'segment' or a hex color
+      }
+    },
+    effects: {
+      load: {
+        effect: 'default', // none / default
+        speed: 1000
+      },
+      pullOutSegmentOnClick: {
+        effect: 'bounce', // none / linear / bounce / elastic / back
+        speed: 300,
+        size: 10
+      },
+      highlightSegmentOnMouseover: true,
+      highlightLuminosity: -0.2
+    },
+    tooltips: {
+      enabled: false,
+      type: 'placeholder', // caption|placeholder
+      string: '',
+      placeholderParser: null,
+      styles: {
+        fadeInSpeed: 250,
+        backgroundColor: '#000000',
+        backgroundOpacity: 0.5,
+        color: '#efefef',
+        borderRadius: 2,
+        font: 'arial',
+        fontSize: 10,
+        padding: 4
+      }
+    },
+
+    misc: {
+      colors: {
+        background: null, // transparent
+        segments: [
+          '#2484c1', '#65a620', '#7b6888', '#a05d56', '#961a1a',
+          '#d8d23a', '#e98125', '#d0743c', '#635222', '#6ada6a',
+          '#0c6197', '#7d9058', '#207f33', '#44b9b0', '#bca44a',
+          '#e4a14b', '#a3acb2', '#8cc3e9', '#69a6f9', '#5b388f',
+          '#546e91', '#8bde95', '#d2ab58', '#273c71', '#98bf6e',
+          '#4daa4b', '#98abc5', '#cc1010', '#31383b', '#006391',
+          '#c2643f', '#b0a474', '#a5a39c', '#a9c2bc', '#22af8c',
+          '#7fcecf', '#987ac6', '#3d3b87', '#b77b1c', '#c9c2b6',
+          '#807ece', '#8db27c', '#be66a2', '#9ed3c6', '#00644b',
+          '#005064', '#77979f', '#77e079', '#9c73ab', '#1f79a7'
+        ],
+        segmentStroke: '#ffffff'
+      },
+      gradient: {
+        enabled: false,
+        percentage: 95,
+        color: '#000000'
+      },
+      canvasPadding: {
+        top: 5,
+        right: 5,
+        bottom: 5,
+        left: 5
+      },
+      pieCenterOffset: {
+        x: 0,
+        y: 0
+      },
+      cssPrefix: null
+    },
+    callbacks: {
+      onload: null,
+      onMouseoverSegment: null,
+      onMouseoutSegment: null,
+      onClickSegment: null
+    }
+  })
\ No newline at end of file
diff --git a/d3pie/d3pie.d.ts b/d3pie/d3pie.d.ts
new file mode 100644
index 0000000000..2bfe5d6525
--- /dev/null
+++ b/d3pie/d3pie.d.ts
@@ -0,0 +1,146 @@
+// Type definitions for d3pie 0.1.9
+// Project: https://github.com/benkeen/d3pie
+// Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace d3pie {
+  interface ID3PieChart {
+    redraw(): void
+    openSegment(index: number): void
+    closeSegment(index: void): void
+    getOpenSegment(): any
+    updateProp(propKey: string, value: any): void
+    destroy(): void
+  }
+
+  interface ID3PieStyleOptions {
+    color?: string
+    fontSize?: number
+    font?: string
+  }
+
+  interface ID3PieTextOptions extends ID3PieStyleOptions {
+    text?: string
+  }
+
+  interface ID3PieLabelsOptions {
+    format?: 'label' | 'value' | 'percentage' | 'label-value1' | 'label-value2' | 'label-percentage1' | 'label-percentage2'
+    hideWhenLessThanPercentage?: number
+  }
+
+  interface ID3PieOptions {
+    header?: {
+      title?: ID3PieTextOptions
+      subtitle?: ID3PieTextOptions
+      location?: 'top-center' | 'top-left' | 'pie-center'
+      titleSubtitlePadding?: number
+    }
+    footer?: { location?: 'left' } & ID3PieTextOptions
+    size?: {
+      canvasHeight?: number
+      canvasWidth?: number
+      pieOuterRadius?: string | number
+      pieInnerRadius?: string | number
+    }
+    data: {
+      sortOrder?: 'none' | 'random' | 'value-asc' | 'value-desc' | 'label-asc' | 'label-desc'
+      smallSegmentGrouping?: {
+        enabled?: boolean
+        value?: number
+        valueType?: 'percentage' | 'value'
+        label?: string
+        color?: string
+      }
+      content: {
+        label: string
+        value: number
+        color?: string
+      }[]
+    }
+    labels?: {
+      outer?: { pieDistance?: number } & ID3PieLabelsOptions
+      inner?: ID3PieLabelsOptions
+      mainLabel?: ID3PieStyleOptions
+      percentage?: { decimalPlaces?: number } & ID3PieStyleOptions
+      value?: ID3PieStyleOptions
+      lines?: {
+        enabled?: boolean
+        style?: 'curved' | 'straight'
+        color?: string
+      }
+      truncation?: {
+        enabled?: boolean
+        truncateLength?: number
+      }
+      formatter?: (context: {
+        section: 'outer' | 'inner'
+        value: number
+        label: string
+      }) => string
+    }
+    effects?: {
+      load?: {
+        effect?: 'none' | 'default'
+        speed?: number
+      }
+      pullOutSegmentOnClick?: {
+        effect?: 'none' | 'linear' | 'bounce' | 'elastic' | 'back'
+        speed?: number
+        size?: number
+      }
+      highlightSegmentOnMouseover?: boolean
+      highlightLuminosity?: number
+    }
+    tooltips?: {
+      enabled?: boolean
+      type?: 'placeholder' | 'caption'
+      string?: string
+      placeholderParser?: (index: number, data: { label?: string, percentage?: number, value?: number }) => void
+      styles?: {
+        fadeInSpeed?: number
+        backgroundColor?: string
+        backgroundOpacity?: number
+        color?: string
+        borderRadius?: number
+        font?: string
+        fontSize?: number
+        padding?: number
+      }
+    }
+    misc?: {
+      colors?: {
+        background?: string
+        segments?: string[]
+        segmentStroke?: string
+      }
+      gradient?: {
+        enabled?: boolean
+        percentage?: number
+        color?: string
+      }
+      canvasPadding?: {
+        top?: number
+        right?: number
+        bottom?: number
+        left?: number
+      }
+      pieCenterOffset?: {
+        x?: number
+        y?: number
+      }
+      cssPrefix?: string
+    }
+    callbacks?: {
+      onload?: Function
+      onMouseoverSegment?: Function
+      onMouseoutSegment?: Function
+      onClickSegment?: Function
+    }
+  }
+
+  interface ID3PieClass {
+    new (id: string | HTMLElement, options: ID3PieOptions): ID3PieChart
+  }
+}
+
+declare const d3pie: d3pie.ID3PieClass
\ No newline at end of file
diff --git a/dagre-d3/dagre-d3-tests.ts b/dagre-d3/dagre-d3-tests.ts
index 836ae6f291..d5e712a66c 100644
--- a/dagre-d3/dagre-d3-tests.ts
+++ b/dagre-d3/dagre-d3-tests.ts
@@ -11,6 +11,9 @@ namespace DagreD3Tests {
 
     predecessors["a"] = graph.predecessors("a");
     successors["a"] = graph.successors("a");
+    graph.transition = (selection: d3.Selection<any>) => {
+        return d3.transition();
+    };
 
     const render = new dagreD3.render();
     const svg = d3.select("svg");
diff --git a/dagre-d3/dagre-d3.d.ts b/dagre-d3/dagre-d3.d.ts
index cbf3bf458a..9248222e98 100644
--- a/dagre-d3/dagre-d3.d.ts
+++ b/dagre-d3/dagre-d3.d.ts
@@ -19,6 +19,8 @@ declare namespace Dagre {
         height: number;
         predecessors(id: string): string[];
         successors(id: string): string[];
+        // see source of http://cpettitt.github.io/project/dagre-d3/latest/demo/interactive-demo.html
+        transition?(selection: d3.Selection<any>): d3.Transition<any>;
         width: number;
     }
 
diff --git a/express-serve-static-core/express-serve-static-core.d.ts b/express-serve-static-core/express-serve-static-core.d.ts
index 2662222d00..e15dbcb5b6 100644
--- a/express-serve-static-core/express-serve-static-core.d.ts
+++ b/express-serve-static-core/express-serve-static-core.d.ts
@@ -17,21 +17,23 @@ declare namespace Express {
 declare module "express-serve-static-core" {
     import * as http from "http";
 
+    type RequestHandlerParams = RequestHandler | RequestHandler[];
+
     interface IRoute {
         path: string;
         stack: any;
-        all(...handler: RequestHandler[]): IRoute;
-        get(...handler: RequestHandler[]): IRoute;
-        post(...handler: RequestHandler[]): IRoute;
-        put(...handler: RequestHandler[]): IRoute;
-        delete(...handler: RequestHandler[]): IRoute;
-        patch(...handler: RequestHandler[]): IRoute;
-        options(...handler: RequestHandler[]): IRoute;
-        head(...handler: RequestHandler[]): IRoute;
+        all(...handler: RequestHandlerParams[]): IRoute;
+        get(...handler: RequestHandlerParams[]): IRoute;
+        post(...handler: RequestHandlerParams[]): IRoute;
+        put(...handler: RequestHandlerParams[]): IRoute;
+        delete(...handler: RequestHandlerParams[]): IRoute;
+        patch(...handler: RequestHandlerParams[]): IRoute;
+        options(...handler: RequestHandlerParams[]): IRoute;
+        head(...handler: RequestHandlerParams[]): IRoute;
     }
 
     interface IRouterMatcher<T> {
-        (name: string | RegExp, ...handlers: RequestHandler[]): T;
+        (name: string | RegExp, ...handlers: RequestHandlerParams[]): T;
     }
 
     interface IRouter<T> extends RequestHandler {
@@ -88,13 +90,13 @@ declare module "express-serve-static-core" {
 
         route(path: string): IRoute;
 
-        use(...handler: RequestHandler[]): T;
-        use(handler: ErrorRequestHandler | RequestHandler): T;
-        use(path: string, ...handler: RequestHandler[]): T;
-        use(path: string, handler: ErrorRequestHandler | RequestHandler): T;
-        use(path: string[], ...handler: RequestHandler[]): T;
+        use(...handler: RequestHandlerParams[]): T;
+        use(handler: ErrorRequestHandler | RequestHandlerParams): T;
+        use(path: string, ...handler: RequestHandlerParams[]): T;
+        use(path: string, handler: ErrorRequestHandler | RequestHandlerParams): T;
+        use(path: string[], ...handler: RequestHandlerParams[]): T;
         use(path: string[], handler: ErrorRequestHandler): T;
-        use(path: RegExp, ...handler: RequestHandler[]): T;
+        use(path: RegExp, ...handler: RequestHandlerParams[]): T;
         use(path: RegExp, handler: ErrorRequestHandler): T;
         use(path: string, router: Router): T;
     }
@@ -860,7 +862,7 @@ declare module "express-serve-static-core" {
         set(setting: string, val: any): Application;
         get: {
             (name: string): any; // Getter
-            (name: string | RegExp, ...handlers: RequestHandler[]): Application;
+            (name: string | RegExp, ...handlers: RequestHandlerParams[]): Application;
         };
 
         /**
diff --git a/fbemitter/fbemitter.d.ts b/fbemitter/fbemitter.d.ts
index b26b1a3162..0f5f6af528 100644
--- a/fbemitter/fbemitter.d.ts
+++ b/fbemitter/fbemitter.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: kmxz <https://github.com/kmxz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module 'fbemitter' {
+declare namespace FBEmitter {
     
     export class EventSubscription {
         
@@ -64,4 +64,8 @@ declare module 'fbemitter' {
          
     }
     
-}
\ No newline at end of file
+}
+
+declare module 'fbemitter' {
+    export = FBEmitter;
+}
diff --git a/flux/flux-tests.ts b/flux/flux-tests.ts
index 24369ef2dd..6bb4350dc6 100644
--- a/flux/flux-tests.ts
+++ b/flux/flux-tests.ts
@@ -1,5 +1,5 @@
 /// <reference path="flux.d.ts" />
-/// <reference path="../react/react.d.ts" />
+/// <reference path="../react/react.d.ts" />
 
 import flux = require('flux')
 import FluxUtils = require('flux/utils')
@@ -88,7 +88,7 @@ export = customDispatcher
 
 
 // Sample Reduce Store
-class CounterStore extends FluxUtils.ReduceStore<number> {
+class CounterStore extends FluxUtils.ReduceStore<number, Action> {
   getInitialState(): number {
     return 0;
   }
@@ -126,4 +126,4 @@ class CounterContainer extends Component<any, any> {
   }
 }
 
-const container = Container.create(CounterContainer);
+const container = Container.create<CounterContainer>(CounterContainer);
diff --git a/flux/flux.d.ts b/flux/flux.d.ts
index 944d23b011..944aa54f3a 100644
--- a/flux/flux.d.ts
+++ b/flux/flux.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../react/react.d.ts" />
+/// <reference path="../fbemitter/fbemitter.d.ts" />
+/// <reference path="../immutable/immutable.d.ts" />
 
 declare namespace Flux {
 
@@ -71,6 +73,29 @@ declare module "flux" {
 declare namespace FluxUtils {
 
     import React = __React;
+    import fbEmitter = FBEmitter;
+    import immutable = Immutable;
+    
+    /**
+     * Default options to create a Container with
+     * 
+     * @interface RealOptions
+     */
+    interface RealOptions {
+        /**
+         * Default value: true
+         * 
+         * @type {boolean}
+         */
+        pure?: boolean;
+        /**
+         * Default value: false
+         * 
+         * @type {boolean}
+         */
+        withProps?: boolean;
+    }
+    
     export class Container {
         constructor();
         /**
@@ -78,14 +103,13 @@ declare namespace FluxUtils {
         * that updates its state when relevant stores change.
         * The provided base class must have static methods getStores() and calculateState().
         */
-        static create(base: React.ComponentClass<any>, options?: any): React.ComponentClass<any>;
+        static create<TComponent>(base: React.ComponentClass<TComponent>, options?: RealOptions): React.ComponentClass<TComponent>;
     }
 
     /**
     * This class extends ReduceStore and defines the state as an immutable map.
     */
-    // TODO: Change <any>  to <Immutable.Map<K, V>>
-    export class MapStore<K extends string | number, V> extends ReduceStore<any> {
+    export class MapStore<K extends string | number, V, TPayload> extends ReduceStore<immutable.Map<K, V>, TPayload> {
         /**
         * Access the value at the given key.
         * Throws an error if the key does not exist in the cache.
@@ -108,12 +132,10 @@ declare namespace FluxUtils {
         * it allows providing a previous result to update instead of generating a new map.
         * Providing a previous result allows the possibility of keeping the same reference if the keys did not change.
         */
-        // TODO: Update with Immutable interface.
-        // getAll(keys: Immutable.IndexedIterable<K>, prev?: Immutable.Map<K, V>): Immutable.Map<K, V>;
-        getAll(keys: any, prev?: any): any;
+        getAll(keys: immutable.Iterable.Indexed<K>, prev?: immutable.Map<K, V>): immutable.Map<K, V>;
     }
 
-    export class ReduceStore<T> extends Store {
+    export class ReduceStore<T, TPayload> extends Store<TPayload> {
         /**
         * Getter that exposes the entire state of this store.
         * If your state is not immutable you should override this and not expose state directly.
@@ -131,7 +153,7 @@ declare namespace FluxUtils {
         * All subclasses must implement this method.
         * This method should be pure and have no side-effects.
         */
-        reduce(state: T, action: any): T;
+        reduce(state: T, action: TPayload): T;
 
         /**
         * Checks if two versions of state are the same.
@@ -141,24 +163,24 @@ declare namespace FluxUtils {
 
     }
 
-    export class Store {
+    export class Store<TPayload> {
 
         /**
         * Constructs and registers an instance of this store with the given dispatcher.
         */
-        constructor(dispatcher: Flux.Dispatcher<any>);
+        constructor(dispatcher: Flux.Dispatcher<TPayload>);
 
         /**
         * Adds a listener to the store, when the store changes the given callback will be called.
         * A token is returned that can be used to remove the listener.
         * Calling the remove() function on the returned token will remove the listener.
         */
-        addListener(callback: Function): { remove: Function };
+        addListener(callback: Function): fbEmitter.EventSubscription;
 
         /**
         * Returns the dispatcher this store is registered with.
         */
-        getDispatcher(): Flux.Dispatcher<any>;
+        getDispatcher(): Flux.Dispatcher<TPayload>;
 
         /**
         * Returns the dispatch token that the dispatcher recognizes this store by.
@@ -185,7 +207,7 @@ declare namespace FluxUtils {
         * This is how the store receives actions from the dispatcher.
         * All state mutation logic must be done during this method.
         */
-        __onDispatch(payload: any): void;
+        __onDispatch(payload: TPayload): void;
     }
 }
 
diff --git a/geojson/geojson-tests.ts b/geojson/geojson-tests.ts
index ce38b654b2..75cf6ffd54 100644
--- a/geojson/geojson-tests.ts
+++ b/geojson/geojson-tests.ts
@@ -72,6 +72,11 @@ var point: GeoJSON.Point = {
 	coordinates: [100.0, 0.0]
 };
 
+
+// This type is commonly used in the turf package
+var pointCoordinates: number[] = point.coordinates
+
+
 var lineString: GeoJSON.LineString = {
 	type: "LineString",
 	coordinates: [ [100.0, 0.0], [101.0, 1.0] ]
@@ -126,4 +131,4 @@ var geometryCollection: GeoJSON.GeometryCollection = {
             coordinates: [ [101.0, 0.0], [102.0, 1.0] ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/geojson/geojson.d.ts b/geojson/geojson.d.ts
index 4b4c2b56cf..38715a9a27 100644
--- a/geojson/geojson.d.ts
+++ b/geojson/geojson.d.ts
@@ -18,10 +18,7 @@ declare namespace GeoJSON {
     /***
     * http://geojson.org/geojson-spec.html#positions
     */
-    export interface Position
-    {
-        [index: number]: number;
-    }
+    export type Position = number[]
 
     /***
     * http://geojson.org/geojson-spec.html#geometry-objects
diff --git a/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index c1a1fbfaf0..9a75f9699e 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -322,6 +322,11 @@ app.on('login', function(event, webContents, request, authInfo, callback) {
 	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);
 
@@ -354,6 +359,8 @@ 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
 
@@ -728,6 +735,8 @@ 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
 
@@ -828,15 +837,23 @@ session.defaultSession.on('will-download', (event, item, webContents) => {
 	console.log(item.getFilename());
 	console.log(item.getTotalBytes());
 
-	item.on('updated', function() {
-		console.log('Received bytes: ' + item.getReceivedBytes());
+	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 is cancelled or interrupted that can't be resumed");
+			console.log(`Download failed: ${state}`)
 		}
 	});
 });
@@ -884,3 +901,15 @@ session.defaultSession.webRequest.onBeforeSendHeaders(filter, function(details,
 	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');
+		}
+	})
+});
diff --git a/github-electron/github-electron.d.ts b/github-electron/github-electron.d.ts
index 00730cb680..f7dd206708 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron v1.2.2
+// Type definitions for Electron v1.2.3
 // Project: http://electron.atom.io/
 // Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -115,6 +115,10 @@ declare namespace Electron {
 		 * 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).
@@ -344,7 +348,7 @@ declare namespace Electron {
 		dock: Dock;
 	}
 
-	type AppPathName = 'home'|'appData'|'userData'|'temp'|'exe'|'module'|'desktop'|'documents'|'downloads'|'music'|'pictures'|'videos';
+	type AppPathName = 'home'|'appData'|'userData'|'temp'|'exe'|'module'|'desktop'|'documents'|'downloads'|'music'|'pictures'|'videos'|'pepperFlashSystemPlugin';
 
 	interface ImportCertificateOptions {
 		/**
@@ -498,9 +502,8 @@ declare namespace Electron {
 		on(event: string, listener: Function): this;
 		/**
 		 * Set the url and initialize the auto updater.
-		 * The url cannot be changed once it is set.
 		 */
-		setFeedURL(url: string): void;
+		setFeedURL(url: string, requestHeaders?: Headers): void;
 		/**
 		 * Ask the server whether there is an update, you have to call setFeedURL
 		 * before using this API
@@ -559,6 +562,10 @@ declare namespace Electron {
 		 * 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.
 		 */
@@ -650,6 +657,10 @@ declare namespace Electron {
 		 * @param name The name of the devtools extension to remove.
 		 */
 		static removeDevToolsExtension(name: string): void;
+		/**
+		 * @returns devtools extensions.
+		 */
+		static getDevToolsExtensions(): DevToolsExtensions;
 		/**
 		 * The WebContents object this window owns, all web page related events and
 		 * operations would be done via it.
@@ -996,7 +1007,7 @@ declare namespace Electron {
 		 */
 		setThumbarButtons(buttons: ThumbarButton[]): boolean;
 		/**
-		 * Shows pop-up dictionary that searches the selected word on the page.
+		 * Same as webContents.showDefinitionForSelection().
 		 * Note: This API is available only on OS X.
 		 */
 		showDefinitionForSelection(): void;
@@ -1042,6 +1053,11 @@ declare namespace Electron {
 		 * but if this window has focus, it will still receive keyboard events.
 		 */
 		setIgnoreMouseEvents(ignore: boolean): void;
+		/**
+		 * Changes whether the window can be focused.
+		 * Note: This API is available only on Windows.
+		 */
+		setFocusable(focusable: boolean): void;
 	}
 
 	type SwipeDirection = 'up' | 'right' | 'down' | 'left';
@@ -1055,6 +1071,13 @@ declare namespace Electron {
 		flags?: ThumbarButtonFlags[];
 	}
 
+	interface DevToolsExtensions {
+		[name: string]: {
+			name: string;
+			value: string;
+		}
+	}
+
 	interface WebPreferences {
 		/**
 		 * Whether node integration is enabled.
@@ -1290,6 +1313,14 @@ declare namespace Electron {
 		 * 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.
@@ -1832,9 +1863,9 @@ declare namespace Electron {
 	 */
 	interface DownloadItem extends NodeJS.EventEmitter {
 		/**
-		 * Emits when the downloadItem gets updated.
+		 * Emitted when the download has been updated and is not done.
 		 */
-		on(event: 'updated', listener: Function): this;
+		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.
@@ -1852,10 +1883,18 @@ declare namespace Electron {
 		 * 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.
 		 */
@@ -1891,6 +1930,10 @@ declare namespace Electron {
 		 * @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
@@ -2042,7 +2085,7 @@ declare namespace Electron {
 
 	type MenuItemType = 'normal' | 'separator' | 'submenu' | 'checkbox' | 'radio';
 	type MenuItemRole = 'undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteandmatchstyle' | 'selectall' | 'delete' | 'minimize' | 'close';
-	type MenuItemRoleMac = 'about' | 'hide' | 'hideothers' | 'unhide' | 'front' | 'window' | 'help' | 'services';
+	type MenuItemRoleMac = 'about' | 'hide' | 'hideothers' | 'unhide' | 'front' | 'zoom' | 'window' | 'help' | 'services';
 
 	interface MenuItemOptions {
 		/**
@@ -2635,6 +2678,10 @@ declare namespace Electron {
 		 * 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';
@@ -3643,6 +3690,11 @@ declare namespace Electron {
 		 * @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 OS X.
+		 */
+		showDefinitionForSelection(): void;
 		/**
 		 * @returns The unique ID of this WebContents.
 		 */
@@ -4428,6 +4480,11 @@ declare namespace Electron {
 		 * See webContents.sendInputEvent for detailed description of event object.
 		 */
 		sendInputEvent(event: SendInputEvent): void
+		/**
+		 * Shows pop-up dictionary that searches the selected word on the page.
+		 * Note: This API is available only on OS X.
+		 */
+		showDefinitionForSelection(): void;
 		/**
 		 * @returns The WebContents associated with this webview.
 		 */
diff --git a/globalize/globalize.d.ts b/globalize/globalize.d.ts
index 8eeec964eb..d3bf7997d5 100644
--- a/globalize/globalize.d.ts
+++ b/globalize/globalize.d.ts
@@ -1,28 +1,330 @@
-// Type definitions for Globalize
+// Type definitions for Globalize
 // Project: https://github.com/jquery/globalize
-// Definitions by: Aram Taieb <https://github.com/afromogli/>
-// Definitions: https://github.com/afromogli/DefinitelyTyped
+// Definitions by: Grégoire Castre <https://github.com/gcastre/>, Aram Taieb <https://github.com/afromogli/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Note: You'll need the cldr.js definition file to use the globalize (https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/cldr.js)
 
-interface NumberFormatterOptions {
-   minimumIntegerDigits?: number;
-   minimumFractionDigits?: number;
-   maximumFractionDigits?: number;
-   minimumSignificantDigits?: number;
-   maximumSignificantDigits?: number;
-   round?: string;
-   useGrouping?: boolean;
+/// <reference path="../cldr.js/cldr.js.d.ts" />
+
+interface DateFormatterOptions {
+	/**
+	 * String value indicating a skeleton (see description above), eg. { skeleton: "GyMMMd" }.
+	 * Skeleton provides a more flexible formatting mechanism than the predefined list full, long, medium, or short represented by date, time, or datetime.
+	 * Instead, they are an open-ended list of patterns containing only date field information, and in a canonical order.
+	 */
+	skeleton?: string;
+	/**
+	 * One of the following String values: full, long, medium, or short, eg. { date: "full" }.
+	 */
+	date?: "full" | "long" | "medium" | "short";
+	/**
+	 * One of the following String values: full, long, medium, or short, eg. { time: "full" }.
+	 */
+	time?: "full" | "long" | "medium" | "short";
+	/**
+	 * One of the following String values: full, long, medium, or short, eg. { datetime: "full" }
+	 */
+	datetime?: "full" | "long" | "medium" | "short";
+	/**
+	 * String value indicating a machine raw pattern (anything in the "Sym." column) eg. { raw: "dd/mm" }.
+	 * Note this is NOT recommended for i18n in general. Use skeleton instead.
+	 */
+	raw?: string;
 }
 
-interface Cldr {
-   /* TODO: add typings */
+interface CommonNumberFormatterOptions {
+	/**
+	 * Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+	 */
+	minimumIntegerDigits?: number;
+	/**
+	 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
+	 * Numbers will be rounded or padded with trailing zeroes if necessary.
+	 * Either one or both of these properties must be present.
+	 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+	 */
+	minimumFractionDigits?: number;
+	/**
+	 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
+	 * Numbers will be rounded or padded with trailing zeroes if necessary.
+	 * Either one or both of these properties must be present.
+	 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+	 */
+	maximumFractionDigits?: number;
+	/**
+	 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
+	 * Either none or both of these properties are present
+	 * If they are, they override minimum and maximum integer and fraction digits.
+	 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+	 */
+	minimumSignificantDigits?: number;
+	/**
+	 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
+	 * Either none or both of these properties are present.
+	 * If they are, they override minimum and maximum integer and fraction digits.
+	 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+	 */
+	maximumSignificantDigits?: number;
+	/**
+	 * String with rounding method ceil, floor, round (default), or truncate.
+	 */
+	round?: "ceil" | "floor" | "round" | "truncate";
+	/**
+	 * Boolean (default is true) value indicating whether a grouping separator should be used.
+	 */
+	useGrouping?: boolean;
+}
+
+interface NumberFormatterOptions extends CommonNumberFormatterOptions {
+	/**
+	 * decimal (default), or percent
+	 */
+	style?: "decimal" | "percent";
+}
+
+interface CurrencyFormatterOptions extends CommonNumberFormatterOptions {
+	/**
+	 * symbol (default), accounting, code or name.
+	 */
+	style?: "symbol" | "accounting" | "code" | "name";
+}
+
+interface NumberParserOptions {
+	/**
+	 * decimal (default), or percent.
+	 */
+	style?: "decimal" | "percent";
+}
+
+interface PluralGeneratorOptions {
+	/**
+	 * cardinal (default), or ordinal.
+	 */
+	type?: "cardinal" | "ordinal";
+}
+
+interface RelativeTimeFormatterOptions {
+	/**
+	 * eg. "short" or "narrow". Or falsy for default long form
+	 */
+	form?: "short" | "narrow";
+}
+
+interface UnitFormatterOptions {
+	/**
+	 * form: [String] eg. "long", "short" or "narrow".
+	 */
+	form?: "long" | "short" | "narrow";
+
+	/**
+	 * numberFormatter: [Function] a number formatter function. Defaults to Globalize .numberFormatter() for the current locale using the default options.
+	 */
+	numberFormatter?: NumberFormatterOptions;
 }
 
 interface GlobalizeStatic {
-   load(jsonData: any): void;
-   locale(locale: string): Cldr;
 
-   numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
-   formatNumber(value:number, options?: NumberFormatterOptions): string;
+	cldr: cldr.CldrStatic;
+
+	/**
+	 * Globalize.load( json, ... )
+	 * @param {Object} [JSON]
+	 * Load resolved or unresolved cldr data.
+	 * Somewhat equivalent to previous Globalize.addCultureInfo(...).
+	 */
+	load(json: Object): void;
+
+	/**
+	 * Globalize.locale()
+	 * Return the default Cldr instance.
+	 */
+	locale(): cldr.CldrStatic;
+
+	/**
+	 * Globalize.locale( [locale] )
+	 * @param {string} locale
+	 * Set default Cldr instance
+	 * Return the default Cldr instance.
+	 */
+
+	locale(locale: string): cldr.CldrStatic;
+	/**
+	 * Globalize.locale( cldr )
+	 * @param {Cldr} cldr [Cldr instance]
+	 * Set default Cldr instance
+	 * Return the default Cldr instance.
+	 */
+	locale(cldr: cldr.CldrStatic): cldr.CldrStatic;
+
+	/**
+	 * .dateFormatter( options )
+	 * @param {DateFormatterOptions} options see date/expand_pattern for more info.
+	 * @returns {Function} Return a function that formats a date according to the given `options` and the default/instance locale.
+	 */
+	dateFormatter(options?: DateFormatterOptions): (value: Date) => string;
+
+	//Return a function that parses a string representing a date into a JavaScript Date object according to the given options. The default parsing assumes numeric year, month, and day (i.e., { skeleton: "yMd" }).
+	dateParser(options?: DateFormatterOptions): (value: string) => Date;
+
+	//Alias for .dateFormatter( [options] )( value ).
+	formatDate(value: Date, options?: DateFormatterOptions): string;
+	/**
+	 * Alias for .dateParser( [options] )( value ).
+	 * @param {string} value The object whose module id you wish to determine.
+	 * @param {DateFormatterOptions} options The object whose module id you wish to determine.
+	 * @returns {Date} Return the value as a Date.
+	 */
+	parseDate(value: string, options?: DateFormatterOptions): Date;
+
+	/**
+	 * Load messages data.
+	 * @param {Object} json JSON object of messages data. Keys can use any character, except /, { and }. Values (i.e., the message content itself) can contain any character.
+	 * @returns {void}
+	 */
+	loadMessages(json: Object): void;
+	/**
+	 * Return a function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
+	 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
+	 * @returns {Function} Return A function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
+	 */
+	messageFormatter(path: string | string[]): (variables?: string | string[] | Object) => string;
+
+	/**
+	 * Formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string
+	 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
+	 * @param variables Variables can be Objects, where each property can be referenced by name inside a message; or Arrays, where each entry of the Array can be used inside a message, using numeric indices. When passing one or more arguments of other types, they're converted to an Array and used as such.
+	 * @returns {string} Return a user-readable string.
+	 */
+	formatMessage(path: string | string[], variables?: string | string[] | Object): string
+
+	/**
+	 * Return a function that formats a number according to the given options or locale's defaults.
+	 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
+	 * style Optional String decimal (default), or percent.
+	 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+	 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+	 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+	 * round Optional String with rounding method ceil, floor, round (default), or truncate.
+	 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
+	 * @returns {Function} Return a function that formats a number according to the given options.
+	 */
+	numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
+
+	/**
+	 * Return a function that parses a string representing a number according to the given options or locale's defaults.
+	 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
+	 * style Optional String decimal (default), or percent.
+	 * @returns {Function} Return a function that parses a String representing a number according to the given options. If value is invalid, NaN is returned.
+	 */
+	numberParser(options?: NumberParserOptions): (value: string) => number
+
+	/**
+	 * Return a number formatted according to the given options or locale's defaults.
+	 * @param {number} value The number to format
+	 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
+	 * style Optional String decimal (default), or percent.
+	 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+	 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+	 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+	 * round Optional String with rounding method ceil, floor, round (default), or truncate.
+	 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
+	 * @returns {string} Return the number formatted
+	 */
+	formatNumber(value: number, options?: NumberFormatterOptions): string;
+
+	/**
+	 * A function that parses a string representing a number according to the given options or locale's defaults.
+	 * @param {string} value The number as string to parse
+	 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
+	 * style Optional String decimal (default), or percent.
+	 * @returns {number} Return a number according to the given options. If value is invalid, NaN is returned.
+	 */
+	parseNumber(value: string, options?: NumberParserOptions): number;
+
+	/**
+	 * Return a function that formats a currency according to the given options or locale's defaults.
+	 * The returned function is invoked with one argument: the Number value to be formatted.
+	 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
+	 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
+	 * @returns {Function} Return a function that formats a currency
+	 */
+	currencyFormatter(currency: string, options?: CurrencyFormatterOptions): (value: number) => string;
+
+	/**
+	 * Return a currency formatted according to the given options or locale's defaults.
+	 * @param {number} value The value to format.
+	 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
+	 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
+	 * @returns {string} Return a string formatted in the currency according to the value and the options
+	 */
+	formatCurrency(value: number, currency: string, options?: CurrencyFormatterOptions): string;
+
+	/**
+	 * Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
+	 * The returned function is invoked with one argument: the Number value for which to return the plural group.
+	 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
+	 * type Optional String cardinal (default), or ordinal.
+	 * @returns {Function} Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
+	 */
+	pluralGenerator(options?: PluralGeneratorOptions): (value: number) => string;
+
+	/**
+	 * Returns the value's corresponding plural group: zero, one, two, few, many, or other.
+	 * @param {number} value A Number for which to return the plural group.
+	 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
+	 * type Optional String cardinal (default), or ordinal.
+	 * @returns {string} Returns the value's corresponding plural group: zero, one, two, few, many, or other.
+	 */
+	plural(value: number, options?: PluralGeneratorOptions): string;
+
+	/**
+	 * Returns a function that formats a relative time according to the given unit, options, and the default/instance locale.
+	 * The returned function is invoked with one argument: the number value to be formatted.
+	 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
+	 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
+	 * @returns {Function} Returns a function that formats a relative time according to the given unit.
+	 */
+	relativeTimeFormatter(unit: string, options?: RelativeTimeFormatterOptions): (value: number) => string;
+
+	/**
+	 * Return a relative time according to the given unit
+	 * @param {number} value The number to be formatted.
+	 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
+	 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
+	 * @returns {string} Return a relative time according to the given unit.
+	 */
+	formatRelativeTime(value: number, unit: string, options?: RelativeTimeFormatterOptions): string;
+
+	/**
+	 * Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
+	 * The returned function is invoked with one argument: the number value to be formatted.
+	 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
+	 * @param options form: [String] eg. "long", "short" or "narrow".
+	 * @returns {Function} Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
+	 */
+	unitFormatter(unit: string, options?: UnitFormatterOptions): (value: number) => string;
+
+	/**
+	 * Alias for .unitFormatter( unit, options )( value ).
+	 * @param {number} value The number to be formatted.
+	 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
+	 * @param {UnitFormatterOptions} options form: [String] eg. "long", "short" or "narrow".
+	 * @returns {string} Returns the unit formatted.
+	 */
+	formatUnit(value: number, unit: string, options?: UnitFormatterOptions): string
+
+	/**
+	 * Create a Globalize instance.
+	 * @param {string} Locale string of the instance.
+	 * @returns {Globalize} A Globalize instance
+	 */
+	new (locale: string): GlobalizeStatic;
+	/**
+	 * Create a Globalize instance.
+	 * @param cldr Cldr instance of the instance.
+	 * @returns {Globalize} A Globalize instance
+	 */
+	new (cldr: cldr.CldrStatic): GlobalizeStatic;
 }
 
 declare var Globalize: GlobalizeStatic;
diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index 4d225779ce..f005582cb2 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -1585,6 +1585,10 @@ declare namespace google.maps {
         setZoom(zoom: number): void;
     }
 
+    export interface FullscreenControlOptions {
+        position?: ControlPosition;
+    }
+
     export interface StreetViewPanoramaOptions {
         addressControl?: boolean;
         addressControlOptions?: StreetViewAddressControlOptions;
@@ -1592,8 +1596,11 @@ declare namespace google.maps {
         disableDefaultUi?: boolean;
         disableDoubleClickZoom?: boolean;
         enableCloseButton?: boolean;
+        fullscreenControl?: boolean;
+        fullscreenControlOptions?: FullscreenControlOptions;
         imageDateControl?: boolean;
         linksControl?: boolean;
+        mode?: "html4" | "html5" |"webgl";
         panControl?: boolean;
         panControlOptions?: PanControlOptions;
         pano?: string;
diff --git a/heatmap.js/heatmap.d.ts b/heatmap.js/heatmap.d.ts
index 3a0bd2ba08..7cd14fc214 100644
--- a/heatmap.js/heatmap.d.ts
+++ b/heatmap.js/heatmap.d.ts
@@ -77,8 +77,9 @@ interface HeatmapConfiguration {
 
     /*
      * The property name of the value/weight in a datapoint
+     * Default value: 'value'
      */
-    valueField: string;
+    valueField?: string;
 }
 
 /*
diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts
index c7584f4e0d..45f69a0bda 100644
--- a/highcharts/highcharts.d.ts
+++ b/highcharts/highcharts.d.ts
@@ -4954,7 +4954,7 @@ interface HighchartsDataPoint {
      * The inner radius of an individual point in a solid gauge. Can be given as a number (pixels) or percentage string.
      * @since 4.1.6
      */
-    innerRadius?: number;
+    innerRadius?: number|string;
     /**
      * When this property is true, the points acts as a summary column for the values added or substracted since the
      * last intermediate sum, or since the start of the series. The y value is ignored.
@@ -5005,7 +5005,7 @@ interface HighchartsDataPoint {
      * The outer radius of an individual point in a solid gauge. Can be given as a number (pixels) or percentage string.
      * @since 4.1.6
      */
-    radius?: number;
+    radius?: number|string;
     /**
      * Whether the data point is selected initially.
      * @default false
diff --git a/intl-tel-input/intl-tel-input-tests.ts b/intl-tel-input/intl-tel-input-tests.ts
new file mode 100644
index 0000000000..739fcc854b
--- /dev/null
+++ b/intl-tel-input/intl-tel-input-tests.ts
@@ -0,0 +1,69 @@
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="intl-tel-input.d.ts" />
+
+$('#phone').intlTelInput();
+
+$('#phone').intlTelInput({
+  customPlaceholder: function(selectedCountryPlaceholder, selectedCountryData) {
+    return 'e.g. ' + selectedCountryPlaceholder;
+  }
+});
+
+$('#phone').intlTelInput({
+  geoIpLookup: function(callback) {
+    $.get('http://ipinfo.io', function() {}, 'jsonp').always(function(resp) {
+      let countryCode = (resp && resp.country) ? <string> resp.country : '';
+      callback(countryCode);
+    });
+  }
+});
+
+$('#phone').intlTelInput('destroy');
+
+let extension = $('#phone').intlTelInput('getExtension');
+
+let intlNumber = $('#phone').intlTelInput('getNumber');
+let ntlNumber = $('#phone').intlTelInput('getNumber', intlTelInputUtils.numberFormat.NATIONAL);
+
+let numberType = $('#phone').intlTelInput('getNumberType');
+if (numberType === intlTelInputUtils.numberType.MOBILE) {}
+
+let countryData = $('#phone').intlTelInput('getSelectedCountryData');
+
+let error = $('#phone').intlTelInput('getValidationError');
+if (error === intlTelInputUtils.validationError.TOO_SHORT) {}
+
+let isValid = $('#phone').intlTelInput('isValidNumber');
+
+$('#phone').intlTelInput('setCountry', 'gb');
+
+$('#phone').intlTelInput('setNumber', '+447733123456');
+
+let countryData3 = $.intlTelInput.getCountryData();
+
+$.intlTelInput.loadUtils('build/js/utils.js');
+
+$('#phone').intlTelInput({
+  utilsScript: '../../build/js/utils.js'
+});
+
+$('#phone').intlTelInput({
+  initialCountry: 'auto',
+  geoIpLookup: function(callback) {
+    $.get('http://ipinfo.io', function() {}, 'jsonp').always(function(resp) {
+      let countryCode = (resp && resp.country) ? resp.country : '';
+      callback(countryCode);
+    });
+  },
+  utilsScript: '../../build/js/utils.js'
+});
+
+$('#phone').intlTelInput({
+  nationalMode: true,
+  utilsScript: '../../build/js/utils.js'
+});
+
+$('#phone').intlTelInput({
+  onlyCountries: ['al'],
+  utilsScript: '../../build/js/utils.js'
+});
diff --git a/intl-tel-input/intl-tel-input.d.ts b/intl-tel-input/intl-tel-input.d.ts
new file mode 100644
index 0000000000..7779f34bd4
--- /dev/null
+++ b/intl-tel-input/intl-tel-input.d.ts
@@ -0,0 +1,252 @@
+// Type definitions for intl-tel-input
+// Project: https://github.com/jackocnr/intl-tel-input
+// Definitions by: Fidan Hakaj <https://github.com/fdnhkj/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../jquery/jquery.d.ts" />
+
+declare namespace IntlTelInput {
+
+  interface Options {
+    /**
+     * Whether or not to allow the dropdown. If disabled, there is no dropdown
+     * arrow, and the selected flag is not clickable. Also we display the
+     * selected flag on the right instead because it is just a marker of state.
+     */
+    allowDropdown?: boolean;
+    /**
+     * If there is just a dial code in the input: remove it on blur or submit,
+     * and re-add it on focus. This is to prevent just a dial code getting
+     * submitted with the form. Requires nationalMode to be set to false.
+     */
+    autoHideDialCode?: boolean;
+    /**
+     * Set the input's placeholder to an example number for the selected country.
+     * You can specify the number type using the numberType option.
+     * If there is already a placeholder attribute set on the input then that
+     * will take precedence. Requires the utilsScript option.
+     */
+    autoPlaceholder?: boolean;
+    /**
+     * Change the placeholder generated by autoPlaceholder. Must return a string.
+     */
+    customPlaceholder?: (selectedCountryPlaceholder: string, selectedCountryData: CountryData) => string;
+    /**
+     * Specify the container for the country dropdown (use a jQuery selector
+     * e.g. "body"). This is useful when the input is within a scrolling element,
+     * or an element with overflow: hidden. Wherever you put the dropdown it
+     * will automatically close on the window scroll event to prevent positioning
+     * issues. If you want it to close when a different element is scrolled
+     * (such as the input's parent), simply listen for the that scroll event,
+     * and trigger $(window).scroll() e.g.
+     */
+    dropdownContainer?: string;
+    /**
+     * Don't display the countries you specify.
+     */
+    excludeCountries?: Array<string>;
+    /**
+     * Format the input value during initialisation.
+     */
+    formatOnInit?: boolean;
+    /**
+     * When setting initialCountry to "auto", you must use this option to
+     * specify a custom function that looks up the user's location. Also note
+     * that when instantiating the plugin, we now return a deferred object, so
+     * you can use .done(callback) to know when initialisation requests like
+     * this have completed.
+     * Note that the callback must still be called in the event of an error.
+     */
+    geoIpLookup?: (callback: (countryCode: string) => void) => void;
+    /**
+     * Set the initial country selection by specifying it's country code.
+     * You can also set it to "auto", which will lookup the user's country based
+     * on their IP address (requires the geoIpLookup option).
+     * Note that the "auto" option will not update the country selection if the
+     * input already contains a number. If you leave initialCountry blank,
+     * it will default to the first country in the list.
+     */
+    initialCountry?: string;
+    /**
+     * Allow users to enter national numbers (and not have to think about
+     * international dial codes). Formatting, validation and placeholders still
+     * work. Then you can use getNumber to extract a full international number.
+     * This option now defaults to true, and it is recommended that you leave it
+     * that way as it provides a better experience for the user.
+     */
+    nationalMode?: boolean;
+    /**
+     * Specify one of the keys from the global enum intlTelInputUtils.numberType
+     *  e.g. "FIXED_LINE" to tell the plugin you're expecting that type of number.
+     * Currently this is only used to set the placeholder to the right type of number.
+     */
+    numberType?: string;
+    /**
+     * Display only the countries you specify.
+     */
+    onlyCountries?: Array<string>;
+    /**
+     * Specify the countries to appear at the top of the list.
+     */
+    preferredCountries?: Array<string>;
+    /**
+     * Display the country dial code next to the selected flag so it's not part
+     * of the typed number. Note that this will disable nationalMode because
+     * technically we are dealing with international numbers, but with the
+     * dial code separated.
+     */
+    separateDialCode?: boolean;
+    /**
+     * Enable formatting/validation etc. by specifying the path to the included
+     * utils.js script, which is fetched only when the page has finished loading
+     * (on window.load) to prevent blocking. When instantiating the plugin,
+     * we return a deferred object, so you can use .done(callback) to know when
+     * initialisation requests like this have finished. Note that if you're
+     * lazy loading the plugin script itself (intlTelInput.js) this will not
+     * work and you will need to use the loadUtils method instead.
+     */
+    utilsScript?: string;
+  }
+
+  interface CountryData {
+    name: string;
+    iso2: string;
+    dialCode: string;
+  }
+
+  interface Static {
+    /**
+     * Get all of the plugin's country data.
+     * Note that any modifications must be done before initialising the plugin.
+     */
+    getCountryData: () => Array<CountryData>;
+    /**
+     * Note: this is only needed if you're lazy loading the plugin script itself (intlTelInput.js).
+     * If not then just use the utilsScript option. Load the utils.js script
+     * (included in the lib directory) to enable formatting/validation etc.
+     * @param path path to the utils.js script.
+     */
+    loadUtils: (path: string) => void;
+  }
+}
+
+declare namespace intlTelInputUtils {
+
+    const enum numberFormat {
+      E164 = 0,
+      INTERNATIONAL = 1,
+      NATIONAL = 2,
+      RFC3966 = 3
+    }
+
+    const enum numberType {
+      FIXED_LINE = 0,
+      MOBILE = 1,
+      FIXED_LINE_OR_MOBILE = 2,
+      TOLL_FREE = 3,
+      PREMIUM_RATE = 4,
+      SHARED_COST = 5,
+      VOIP = 6,
+      PERSONAL_NUMBER = 7,
+      PAGER = 8,
+      UAN = 9,
+      VOICEMAIL = 10,
+      UNKNOWN = -1
+    }
+
+    const enum validationError {
+      IS_POSSIBLE = 0,
+      INVALID_COUNTRY_CODE = 1,
+      TOO_SHORT = 2,
+      TOO_LONG = 3,
+      NOT_A_NUMBER = 4
+    }
+}
+
+interface JQueryStatic {
+  intlTelInput: IntlTelInput.Static;
+}
+
+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>;
+}
diff --git a/javascript-obfuscator/javascript-obfuscator-tests.ts b/javascript-obfuscator/javascript-obfuscator-tests.ts
index 74d6363ffb..1c0753c3bf 100644
--- a/javascript-obfuscator/javascript-obfuscator-tests.ts
+++ b/javascript-obfuscator/javascript-obfuscator-tests.ts
@@ -5,11 +5,14 @@ import { JavaScriptObfuscator } from 'javascript-obfuscator';
 let sourceCode1: string = JavaScriptObfuscator.obfuscate('var foo = 1;');
 let sourceCode2: string = JavaScriptObfuscator.obfuscate('var foo = 1;', {
   compact: true,
-  debugProtection: false,
-  debugProtectionInterval: false,
-  disableConsoleOutput: true,
-  encodeUnicodeLiterals: true,
-  rotateUnicodeArray: true,
-  unicodeArray: true,
-  wrapUnicodeArrayCalls: true
+    debugProtection: false,
+    debugProtectionInterval: false,
+    disableConsoleOutput: true,
+    encodeUnicodeLiterals: false,
+    reservedNames: ['^foo$'],
+    rotateUnicodeArray: true,
+    selfDefending: true,
+    unicodeArray: true,
+    unicodeArrayThreshold: 0.8,
+    wrapUnicodeArrayCalls: true
 });
diff --git a/javascript-obfuscator/javascript-obfuscator.d.ts b/javascript-obfuscator/javascript-obfuscator.d.ts
index 7b7a8438c5..17a91c4925 100644
--- a/javascript-obfuscator/javascript-obfuscator.d.ts
+++ b/javascript-obfuscator/javascript-obfuscator.d.ts
@@ -10,8 +10,11 @@ declare module 'javascript-obfuscator' {
     debugProtectionInterval?: boolean;
     disableConsoleOutput?: boolean;
     encodeUnicodeLiterals?: boolean;
+    reservedNames?: string[];
     rotateUnicodeArray?: boolean;
+    selfDefending?: boolean;
     unicodeArray?: boolean;
+    unicodeArrayThreshold?: number;
     wrapUnicodeArrayCalls?: boolean;
     [id: string]: any;
   }
diff --git a/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts b/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
index fcc3bac9da..9c13b5a28f 100644
--- a/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
+++ b/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Microsoft jQuery Unobtrusive Validation v3.2.3
-// Project: http://aspnetwebstack.codeplex.com/
+// Project: https://github.com/aspnet/jquery-validation-unobtrusive
 // Definitions by: Matt Brooks <https://github.com/EnableSoftware>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/jquery.slimScroll/jquery.SlimScroll-tests.ts b/jquery.slimScroll/jquery.SlimScroll-tests.ts
index deb4f2406d..046eda840f 100644
--- a/jquery.slimScroll/jquery.SlimScroll-tests.ts
+++ b/jquery.slimScroll/jquery.SlimScroll-tests.ts
@@ -41,6 +41,21 @@ $('#slimtest3').slimScroll({
     alwaysVisible: true
 });
 
+$('#slimtest3').slimScroll({
+    color: '#00f',
+    size: '10px',
+    height: '180px',
+    alwaysVisible: true,
+    destroy: true
+});
+
 $("div").slimScroll().bind('slimscroll', function(e){
     console.log("Reached " + e);
-});
\ No newline at end of file
+});
+
+var options : IJQuerySlimScrollOptions = {
+    destroy: true,
+    position: 'left'
+};
+
+$('#slimtest3').slimScroll(options);
diff --git a/jquery.slimScroll/jquery.slimScroll.d.ts b/jquery.slimScroll/jquery.slimScroll.d.ts
index 4d77d28817..b5d3dab17f 100644
--- a/jquery.slimScroll/jquery.slimScroll.d.ts
+++ b/jquery.slimScroll/jquery.slimScroll.d.ts
@@ -1,58 +1,110 @@
-// Type definitions for jQuery.slimScroll v1.3.3
+// Type definitions for jQuery.slimScroll v1.3.8
 // Project: https://github.com/rochal/jQuery-slimScroll
 // Definitions by: Chintan Shah <https://github.com/Promact>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference path="../jquery/jquery.d.ts"/>
 
 interface IJQuerySlimScrollOptions {
-    // width in pixels of the visible scroll area
+    /**
+     * width in pixels of the visible scroll area
+     */
     width? :string;
-    // height in pixels of the visible scroll area
+    /**
+     * height in pixels of the visible scroll area
+     */
     height? :string;
-    // width in pixels of the scrollbar and rail
+    /**
+     * width in pixels of the scrollbar and rail
+     */
     size? :string;
-    // scrollbar color, accepts any hex/color value
+    /**
+     * scrollbar color, accepts any hex/color value
+     */
     color?:string;
-    // scrollbar position - left/right
+    /**
+     * scrollbar position - left/right
+     */
     position?:string;
-    // distance in pixels between the side edge and the scrollbar
+    /**
+     * distance in pixels between the side edge and the scrollbar
+     */
     distance?:string;
-    // default scroll position on load - top / bottom / $('selector')
+    /**
+     * default scroll position on load - top / bottom / $('selector')
+     */
     start?:any;
-    // sets scrollbar opacity
+    /**
+     * sets scrollbar opacity
+     */
     opacity? :number;
-    // enables always-on mode for the scrollbar
+    /**
+     * enables always-on mode for the scrollbar
+     */
     alwaysVisible?: boolean;
-    // check if we should hide the scrollbar when user is hovering over
+    /**
+     * check if we should hide the scrollbar when user is hovering over
+     */
     disableFadeOut?: boolean;
-    // sets visibility of the rail
+    /**
+     * sets visibility of the rail
+     */
     railVisible?: boolean;
-    // sets rail color
+    /**
+     * sets rail color
+     */
     railColor?: string;
-    // sets rail opacity
+    /**
+     * sets rail opacity
+     */
     railOpacity?:number;
-    // whether  we should use jQuery UI Draggable to enable bar dragging
+    /**
+     * whether  we should use jQuery UI Draggable to enable bar dragging
+     */
     railDraggable?: boolean;
-    // defautlt CSS class of the slimscroll rail
+    /**
+     * default CSS class of the slimscroll rail
+     */
     railClass?: string;
-    // defautlt CSS class of the slimscroll bar
+    /**
+     * default CSS class of the slimscroll bar
+     */
     barClass?: string;
-    // defautlt CSS class of the slimscroll wrapper
+    /**
+     * default CSS class of the slimscroll wrapper
+     */
     wrapperClass?: string;
-    // check if mousewheel should scroll the window if we reach top/bottom
+    /**
+     * check if mousewheel should scroll the window if we reach top/bottom
+     */
     allowPageScroll?: boolean;
-    // scroll amount applied to each mouse wheel step
+    /**
+     * scroll amount applied to each mouse wheel step
+     */
     wheelStep?: number;
-    // scroll amount applied when user is using gestures
+    /**
+     * scroll amount applied when user is using gestures
+     */
     touchScrollStep?: number;
-    // sets border radius
+    /**
+     * sets border radius
+     */
     borderRadius?: string;
-    // sets border radius of the rail
+    /**
+     * sets border radius of the rail
+     */
     railBorderRadius?: string;
-    // jumps to the specified scroll value
+    /**
+     * jumps to the specified scroll value
+     */
     scrollTo?: string;
-    // increases/decreases current scroll value by specified amount
+    /**
+     * increases/decreases current scroll value by specified amount
+     */
     scrollBy?: string;
+    /**
+     * release resources held by the plugin
+     */
+    destroy?:boolean;
 }
 
 interface JQuery {
diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index 6478529dad..40ebf2ee6c 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -1987,6 +1987,24 @@ interface JQuery {
      */
     click(eventData?: any, handler?: (eventObject: JQueryEventObject) => any): JQuery;
 
+    /**
+     * Trigger the "contextmenu" event on an element.
+     */
+    contextmenu(): JQuery;
+    /**
+     * Bind an event handler to the "contextmenu" JavaScript event.
+     *
+     * @param handler A function to execute when the event is triggered.
+     */
+    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.
+     */
+    contextmenu(eventData: Object, handler: (eventObject: JQueryMouseEventObject) => any): JQuery;
+
     /**
      * Trigger the "dblclick" event on an element.
      */
diff --git a/kendo-ui/kendo-ui.d.ts b/kendo-ui/kendo-ui.d.ts
index b283f21c14..934a8cd8b1 100644
--- a/kendo-ui/kendo-ui.d.ts
+++ b/kendo-ui/kendo-ui.d.ts
@@ -1282,6 +1282,7 @@ declare namespace kendo.data {
 
     interface DataSourceRequestStartEvent extends DataSourceEvent {
         type?: string;
+        preventDefault(): void;
     }
 
     interface DataSourceRequestEndEvent extends DataSourceEvent {
@@ -3334,6 +3335,7 @@ declare namespace kendo.ui {
         static fn: DropDownList;
 
         options: DropDownListOptions;
+        popup: kendo.ui.Popup;
 
         dataSource: kendo.data.DataSource;
         span: JQuery;
diff --git a/kii-cloud-sdk/kii-cloud-sdk-tests.ts b/kii-cloud-sdk/kii-cloud-sdk-tests.ts
index a7118d78d3..6ca7d611db 100644
--- a/kii-cloud-sdk/kii-cloud-sdk-tests.ts
+++ b/kii-cloud-sdk/kii-cloud-sdk-tests.ts
@@ -26,6 +26,9 @@ function main() {
             endpoint.installationID;
         });
 
+    user.setLocale("en");
+    var locale: string = user.getLocale();
+
     var anotherUser: KiiUser = KiiUserBuilder
         .builderWithIdentifier("id", "password")
         .setEmailAddress("mail@example.org")
@@ -67,4 +70,30 @@ function main() {
                           removeMembersArray: KiiUser[]) {
         }
     });
+
+    Kii.authenticateAsThing("thing id", "password", {
+        success: function (thingAuthContext: KiiThingContext) {
+            thingAuthContext.bucketWithName("");
+        },
+        failure: function (error) {
+        }
+    })
+        .then(function (thingAuthContext: KiiThingContext) {
+        });
+
+    Kii.authenticateAsThingWithToken("thing id", "token", {
+        success: function (thingAuthContext: KiiThingContext) {
+            thingAuthContext.bucketWithName("");
+        },
+        failure: function (error) {
+        }
+    })
+        .then(function (thingAuthContext: KiiThingContext) {
+        });
+
+    KiiThing.loadWithVendorThingID("thing ID")
+        .then(function (thing) {
+            var isOnline: boolean = thing.isOnline();
+            var onlineStatusModifiedAt: Date = thing.getOnlineStatusModifiedAt();
+        });
 }
diff --git a/kii-cloud-sdk/kii-cloud-sdk.d.ts b/kii-cloud-sdk/kii-cloud-sdk.d.ts
index 550aa736fa..26decd07a0 100644
--- a/kii-cloud-sdk/kii-cloud-sdk.d.ts
+++ b/kii-cloud-sdk/kii-cloud-sdk.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Kii Cloud SDK v2.4.4
+// Type definitions for Kii Cloud SDK v2.4.6
 // Project: http://en.kii.com/
 // Definitions by: Kii Consortium <http://jp.kii.com/consortium/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -17,7 +17,8 @@ declare namespace KiiCloud {
         JP,
         CN,
         SG,
-        CN3
+        CN3,
+        EU
     }
 
     export enum KiiAnalyticsSite {
@@ -25,7 +26,8 @@ declare namespace KiiCloud {
         JP,
         CN,
         SG,
-        CN3
+        CN3,
+        EU
     }
 
     enum KiiSocialNetworkName {
@@ -512,6 +514,104 @@ declare namespace KiiCloud {
          *     );
          */
         static listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+
+        /**
+         * Authenticate as Thing.
+         * <br><br>
+         * <b>This api is intended to be used in a Thing device, where the user
+         * credentials or app admin context is not configured. This Thing must be
+         * already registered in Kii Cloud.
+         * </b>
+         *
+         * @param vendorThingID vendorThingID of a registered Thing.
+         * @param password password for the registered Thing.
+         * @param callbacks The callback methods called when authentication succeeded/failed.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(thingAuthContext). thingAuthContext is a KiiThingContext instance.</li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsThing("vendor thing id", "password of this thing", {
+         *         success: function(thingAuthContext) {
+         *             // thingAuthContext : KiiThingContext instance
+         *             // Operate entities with thingAuthContext.
+         *         },
+         *         failure: function(error) {
+         *             // Authentication failed.
+         *         }
+         *     );
+         *
+         *     // example to use Promise
+         *     Kii.authenticateAsThing("vendor thing id", "password of this thing").then(
+         *         function(thingAuthContext) {　// fulfill callback function
+         *             // thingAuthContext : KiiThingContext instance
+         *             // Operate entities with thingAuthContext.
+         *
+         *         },
+         *         function(error) { // reject callback function
+         *             // Authentication failed.
+         *             var errorString = error.message;
+         *         }
+         *     );
+         */
+        static authenticateAsThing(vendorThingID: string, password: string, callbacks?: { success(thingAuthContext: KiiThingContext): any; failure(error: Error): any; }): Promise<KiiThingContext>;
+
+        /**
+         * Create a KiiThingContext reference
+         * <br><br>
+         * <b>This api is intended to be used in a Thing device, where the user
+         * credentials or app admin context is not configured. This Thing must be
+         * already registered in Kii Cloud.
+         * </b>
+         *
+         * @param thingID thingID of a registered Thing.
+         * @param token token for the registered Thing.
+         * @param callbacks The callback methods called when creation succeeded/failed.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(thingContext). thingContext is a KiiThingContext instance.</li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     Kii.authenticateAsThingWithToken("thing_id", "thing_token", {
+         *         success: function(thingContext) {
+         *             // thingContext : KiiThingContext instance
+         *             // Operate entities with thingContext.
+         *         },
+         *         failure: function(error) {
+         *             // Creation failed.
+         *         }
+         *     );
+         *
+         *     // example to use Promise
+         *     Kii.authenticateAsThingWithToken("thing_id", "thing_token").then(
+         *         function(thingContext) {　// fulfill callback function
+         *             // thingContext : KiiThingContext instance
+         *             // Operate entities with thingContext.
+         *
+         *         },
+         *         function(error) { // reject callback function
+         *             // Creation failed.
+         *             var errorString = error.message;
+         *         }
+         *     );
+         */
+        static authenticateAsThingWithToken(thingID: string, token: string, callbacks?: { success(thingContext: KiiThingContext): any; failure(error: Error): any; }): Promise<KiiThingContext>;
     }
 
     /**
@@ -3744,7 +3844,7 @@ declare namespace KiiCloud {
          *         <li>response.username is username to use for connecting to the MQTT broker.</li>
          *         <li>response.password is assword to use for connecting to the MQTT broker.</li>
          *         <li>response.mqttTopic is topic to subscribe in the MQTT broker.</li>
-         *         <li>response.host is URL of the MQTT broker host to connect.</li>
+         *         <li>response.host is hostname of the MQTT broker.</li>
          *         <li>response.X-MQTT-TTL is the amount of time in seconds that specifies how long the mqttTopic will be valid, after that the client needs to request new MQTT endpoint info.</li>
          *         <li>response.portTCP is port to connect using plain TCP.</li>
          *         <li>response.portSSL is port to connect using SSL/TLS.</li>
@@ -4986,6 +5086,20 @@ declare namespace KiiCloud {
          */
         getDisabled(): boolean;
 
+        /**
+         * Get online status of the thing.
+         *
+         * @return true if the thing is online, false otherwise. The return value will be null initially until the thing is connected for the first time.
+         */
+        isOnline(): boolean;
+
+        /**
+         * Get online status modified date of the thing.
+         *
+         * @return online status modified time of this thing. The date will be null initially until the thing is connected for the first time.
+         */
+        getOnlineStatusModifiedAt(): Date;
+
         /**
          * Register thing in KiiCloud.<br>
          * This API doesnt require users login Anonymous user can register thing.
@@ -5794,6 +5908,156 @@ declare namespace KiiCloud {
         pushSubscription(): KiiPushSubscription;
     }
 
+    /**
+     * represents a KiiThingContext object
+     */
+    export class KiiThingContext {
+        /**
+         * Creates a reference to a bucket in App scope operated by thing.
+         *
+         * @param bucketName The name of the bucket the app should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *         Kii.authenticateAsThing("vendorThingID", "password", {
+         *             success: function(thingAuthContext) {
+         *                 var bucket = thingAuthContext.bucketWithName("myAppBucket");
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        bucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to a encrypted bucket in App scope operated by thing.
+         *     <br><br>The bucket will be created/accessed within this app's scope
+         *
+         * @param bucketName The name of the bucket the app should create/access
+         *
+         * @return A working KiiBucket object
+         *
+         * @example
+         *         Kii.authenticateAsThing("vendorThingID", "password", {
+         *             success: function(thingAuthContext) {
+         *                 var bucket = thingAuthContext.encryptedBucketWithName("myAppBucket");
+         *             },
+         *             failure: function(errorString, errorCode) {
+         *                 // auth failed.
+         *             }
+         *         });
+         */
+        encryptedBucketWithName(bucketName: string): KiiBucket;
+
+        /**
+         * Creates a reference to an object operated by thing using object`s URI.
+         *
+         * @param object URI.
+         *
+         * @return A working KiiObject instance
+         *
+         * @throws If the URI is null, empty or does not have correct format.
+         */
+        objectWithURI(object: string): KiiObject;
+
+        /**
+         * Creates a reference to a topic in App scope operated by thing.
+         * <br><br>The Topic will be created/accessed within this app's scope
+         *
+         * @param topicName name of the topic. Must be a not empty string.
+         *
+         * @return topic instance.
+         */
+        topicWithName(topicName: string): KiiTopic;
+
+        /**
+         * Gets a list of topics in app scope
+         *
+         * @param callbacks An object with callback methods defined
+         * @param paginationKey You can specify the pagination key with the nextPaginationKey passed by callbacks.success. If empty string or no string object is provided, this API regards no paginationKey specified.
+         *
+         * @return return promise object.
+         *     <ul>
+         *       <li>fulfill callback function: function(params). params is Array instance.
+         *         <ul>
+         *           <li>params[0] is array of KiiTopic instances.</li>
+         *           <li>params[1] is string of nextPaginationKey.</li>
+         *         </ul>
+         *       </li>
+         *       <li>reject callback function: function(error). error is an Error instance.
+         *         <ul>
+         *           <li>error.target is a KiiAppAdminContext instance which this method was called on.</li>
+         *           <li>error.message</li>
+         *         </ul>
+         *       </li>
+         *     </ul>
+         *
+         * @example
+         *     // example to use callbacks directly
+         *     // Assume you already have thingAuthContext instance.
+         *     thingAuthContext.listTopics({
+         *         success: function(topicList, nextPaginationKey) {
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 thingAuthContext.listTopics({
+         *                     success: function(topicList, nextPaginationKey) {...},
+         *                     failure: function(anErrorString) {...}
+         *                 }, nextPaginationKey);
+         *             }
+         *         },
+         *         failure: function(anErrorString) {
+         *             // do something with the error response
+         *         }
+         *     });
+         *
+         *     // example to use Promise
+         *     // Assume you already have thingAuthContext instance.
+         *     thingAuthContext.listTopics().then(
+         *         function(params) {
+         *             var topicList = params[0];
+         *             var nextPaginationKey = params[1];
+         *             // do something with the result
+         *             for(var i=0; i&lt;topicList.length; i++){
+         *                 var topic = topicList[i];
+         *             }
+         *             if (nextPaginationKey != null) {
+         *                 thingAuthContext.listTopics(null, nextPaginationKey).then(
+         *                     function(params) {...},
+         *                     function(error) {...}
+         *                 );
+         *             }
+         *         },
+         *         function(error) {
+         *             // do something with the error response
+         *         }
+         *     );
+         */
+        listTopics(callbacks?: { success(topicList: KiiTopic[], nextPaginationKey: string): any; failure(anErrorString: string): any; }, paginationKey?: string): Promise<[KiiTopic[], string]>;
+
+        /**
+         * Gets authenticated KiiThing instance.
+         * <br>Returned thing instance only have thingID, vendorThingID and accessToken.
+         * (vendorThingID is not included when you used
+         * {@link Kii.authenticateAsThingWithToken()} to obtain KiiThingContext.)
+         * <br>Please execute {@link KiiThing#refresh()} to obtain other properties.
+         *
+         * @return return authenticated KiiThing instance.
+         */
+        getAuthenticatedThing(): KiiThing;
+
+        /**
+         * Instantiate push installation for this thing.
+         *
+         * @return push installation object.
+         */
+        pushInstallation(): KiiPushInstallation;
+    }
+
     /**
      * Represents a Topic object.
      */
@@ -6106,6 +6370,25 @@ declare namespace KiiCloud {
          */
         setCountry(value: string): void;
 
+        /**
+         * Get the locale associated with this user
+         *
+         * @return
+         */
+        getLocale(): string;
+
+        /**
+         * Set the locale associated with this user
+         * The locale argument must be BCP 47 language tag.
+         * Examples:
+         * "en": English
+         * "de-AT": German as used in Austria.
+         * "zh-Hans-CN": Chinese written in simplified characters as used in China.
+         *
+         * @param value The locale to set.
+         */
+        setLocale(value: string): void;
+
         /**
          * Get the server's creation date of this user
          *
@@ -6196,7 +6479,7 @@ declare namespace KiiCloud {
         /**
          * Sets a key/value pair to a KiiUser
          *
-         * <br><br>If the key already exists, its value will be written over. If the object is of invalid type, it will return false and a KiiError will be thrown (quietly). Accepted types are any JSON-encodable objects.
+         * <br><br>If the key already exists, its value will be written over. If key is empty or starting with '_', it will do nothing. Accepted types are any JSON-encodable objects.
          *
          * @param key The key to set. The key must not be a system key (created, metadata, modified, type, uuid) or begin with an underscore (_)
          * @param value The value to be set. Object must be of a JSON-encodable type (Ex: dictionary, array, string, number, etc)
@@ -7826,6 +8109,7 @@ import KiiServerCodeEntry = KiiCloud.KiiServerCodeEntry;
 import KiiServerCodeExecResult = KiiCloud.KiiServerCodeExecResult;
 import KiiSocialConnect = KiiCloud.KiiSocialConnect;
 import KiiThing = KiiCloud.KiiThing;
+import KiiThingContext = KiiCloud.KiiThingContext;
 import KiiTopic = KiiCloud.KiiTopic;
 import KiiUser = KiiCloud.KiiUser;
 import KiiUserBuilder = KiiCloud.KiiUserBuilder;
diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts
index 410139f4b6..c01c54691e 100644
--- a/knex/knex-tests.ts
+++ b/knex/knex-tests.ts
@@ -162,6 +162,8 @@ knex.select('*').from('users').join('accounts', function() {
 
 knex.select('*').from('users').join('accounts', 'accounts.type', knex.raw('?', ['admin']));
 
+knex.raw('select * from users where id = :user_id', { user_id: 1 });
+
 knex.from('users').innerJoin('accounts', 'users.id', 'accounts.user_id');
 
 knex.table('users').innerJoin('accounts', 'users.id', '=', 'accounts.user_id');
diff --git a/knex/knex.d.ts b/knex/knex.d.ts
index c3ede588e8..e5d796350c 100644
--- a/knex/knex.d.ts
+++ b/knex/knex.d.ts
@@ -31,6 +31,7 @@ declare module "knex" {
     migrate: Knex.Migrator;
     seed: any;
     fn: any;
+    on(eventName: string, callback: Function): Knex.QueryBuilder;
   }
 
   function Knex(config: Knex.Config) : Knex;
@@ -249,6 +250,7 @@ declare module "knex" {
       (value: Value): Raw;
       (sql: string, ...bindings: Value[]): Raw;
       (sql: string, bindings: Value[]): Raw;
+      (sql: string, bindings: Object): Raw;
     }
 
     //
@@ -301,6 +303,7 @@ declare module "knex" {
 
     interface SchemaBuilder extends Promise<any> {
       createTable(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
+      createTableIfNotExists(tableName: string, callback: (tableBuilder: CreateTableBuilder) => any): SchemaBuilder;
       renameTable(oldTableName: string, newTableName: string): Promise<void>;
       dropTable(tableName: string): SchemaBuilder;
       hasTable(tableName: string): Promise<boolean>;
@@ -312,6 +315,7 @@ declare module "knex" {
 
     interface TableBuilder {
       increments(columnName?: string): ColumnBuilder;
+      bigIncrements(columnName?: string): ColumnBuilder;
       dropColumn(columnName: string): TableBuilder;
       dropColumns(...columnNames: string[]): TableBuilder;
       renameColumn(from: string, to: string): ColumnBuilder;
diff --git a/knockout.kogrid/ko-grid.d.ts b/knockout.kogrid/ko-grid.d.ts
index fe9877e038..a8f3984acf 100644
--- a/knockout.kogrid/ko-grid.d.ts
+++ b/knockout.kogrid/ko-grid.d.ts
@@ -6,192 +6,270 @@
 // These are very definitely preliminary. Please feel free to improve.
 
 /// <reference path="../knockout/knockout.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
 
 declare namespace kg {
-    interface DomUtilityService {
-        UpdateGridLayout(grid: Grid<any>): void;
-        BuildStyles(grid: Grid<any>): void;
-    }
+   interface DomUtilityService {
+      UpdateGridLayout(grid: Grid<any>): void;
+      BuildStyles(grid: Grid<any>): void;
+   }
 
-    interface Row<EntityType> {
-        selected: KnockoutObservable<boolean>;
-        entity: EntityType;
-    }
+   interface Row<EntityType> {
+      selected: KnockoutObservable<boolean>;
+      entity: EntityType;
+   }
 
-    interface RowFactory<EntityType> {
-        rowCache: Row<EntityType>[];
-    }
+   interface RowFactory<EntityType> {
+      rowCache: Row<EntityType>[];
+   }
 
-    interface SelectionService<EntityType>  {
-        setSelection(row: Row<EntityType>, selected: boolean): void;
-        multi: boolean;
-        lastClickedRow: Row<EntityType>;
-    }
+   interface SelectionService<EntityType> {
+      setSelection(row: Row<EntityType>, selected: boolean): void;
+      multi: boolean;
+      lastClickedRow: Row<EntityType>;
+   }
 
-    interface Grid<EntityType> {
-        configureColumnWidths(): void;
-        rowFactory: RowFactory<EntityType>;
-        config: GridOptions<EntityType>;
-        $$selectionPhase: boolean;
-        selectionService: SelectionService<EntityType>;
-    }
+   interface Grid<EntityType> {
+      configureColumnWidths(): void;
+      rowFactory: RowFactory<EntityType>;
+      config: GridOptions<EntityType>;
+      $$selectionPhase: boolean;
+      selectionService: SelectionService<EntityType>;
+   }
 
-    interface Plugin<EntityType> {
-        onGridInit(grid: Grid<EntityType>): void;
-    }
+   interface Plugin<EntityType> {
+      onGridInit(grid: Grid<EntityType>): void;
+   }
 
-    interface GridOptions<EntityType> {
-        /** Callback for when you want to validate something after selection. */
-        afterSelectionChange?(row: Row<EntityType>): void;
+   interface GridOptions<EntityType> {
+      /** Callback for when you want to validate something after selection. */
+      afterSelectionChange?(row: Row<EntityType>): void;
 
-        /** Callback if you want to inspect something before selection,
-        return false if you want to cancel the selection. return true otherwise.
-        If you need to wait for an async call to proceed with selection you can
-        use rowItem.changeSelection(event) method after returning false initially.
-        Note: when shift+ Selecting multiple items in the grid this will only get called
-        once and the rowItem will be an array of items that are queued to be selected. */
-        beforeSelectionChange?: Function;
+      /** Callback if you want to inspect something before selection,
+      return false if you want to cancel the selection. return true otherwise.
+      If you need to wait for an async call to proceed with selection you can
+      use rowItem.changeSelection(event) method after returning false initially.
+      Note: when shift+ Selecting multiple items in the grid this will only get called
+      once and the rowItem will be an array of items that are queued to be selected. */
+      beforeSelectionChange?(row: Row<EntityType>): boolean;
 
-        /** definitions of columns as an array [], if not defined columns are auto-generated. See github wiki for more details. */
-        columnDefs?: ColumnDef[];
+      /** To be able to have selectable rows in grid. */
+      canSelectRows?:boolean;
 
-        /** Column width of columns in grid. */
-        columnWidth?: number;
+      /** definitions of columns as an array [], if not defined columns are auto-generated. See github wiki for more details. */
+      columnDefs?: ColumnDef[] | KnockoutObservable<ColumnDef[]>;
 
-        /** Data being displayed in the grid. Each item in the array is mapped to a row being displayed. */
-        data?: KnockoutObservableArray<EntityType>;
+      /** Column width of columns in grid. */
+      columnWidth?: number;
 
-        /** Row selection check boxes appear as the first column. */
-        displaySelectionCheckbox: boolean;
+      /** Data being displayed in the grid. Each item in the array is mapped to a row being displayed. */
+      data?: KnockoutObservableArray<EntityType>;
 
-        /** Enable or disable resizing of columns */
-        enableColumnResize?: boolean;
+      /** Row selection check boxes appear as the first column. */
+      displaySelectionCheckbox: boolean;
 
-        /** Enables the server-side paging feature */
-        enablePaging?: boolean;
+      /** Enable or disable resizing of columns */
+      enableColumnResize?: boolean;
 
-        /** Enable column pinning */
-        enablePinning?: boolean;
+      /** Enables the server-side paging feature */
+      enablePaging?: boolean;
 
-        /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */
-        enableRowReordering?: boolean;
+      /** Enable drag and drop row reordering. Only works in HTML5 compliant browsers. */
+      enableRowReordering?: boolean;
 
-        /** To be able to have selectable rows in grid. */
-        enableRowSelection?: boolean;
+      /** Enables or disables sorting in grid. */
+      enableSorting?: boolean;
 
-        /** Enables or disables sorting in grid. */
-        enableSorting?: boolean;
+      /** filterOptions -
+      filterText: The text bound to the built-in search box.
+      useExternalFilter: Bypass internal filtering if you want to roll your own filtering mechanism but want to use builtin search box.
+      */
+      filterOptions?: FilterOptions;
 
-        /** filterOptions -
-        filterText: The text bound to the built-in search box.
-        useExternalFilter: Bypass internal filtering if you want to roll your own filtering mechanism but want to use builtin search box.
-        */
-        filterOptions?: FilterOptions;
+      /** Defining the height of the footer in pixels. */
+      footerRowHeight?: number;
 
-        /** Defining the height of the footer in pixels. */
-        footerRowHeight?: number;
+      /** Show or hide the footer alltogether the footer is enabled by default */
+      footerVisible?: boolean;
 
-        /** Show or hide the footer alltogether the footer is enabled by default */
-        footerVisible?: boolean;
+      /** Initial fields to group data by. Array of field names, not displayName. */
+      groups?: string[];
 
-        /** Initial fields to group data by. Array of field names, not displayName. */
-        groups?: string[];
+      /** The height of the header row in pixels. */
+      headerRowHeight?: number;
 
-        /** The height of the header row in pixels. */
-        headerRowHeight?: number;
+      /** Define a header row template for further customization. See github wiki for more details. */
+      headerRowTemplate?: string | JQueryGenericPromise<string>;
 
-        /** Define a header row template for further customization. See github wiki for more details. */
-        headerRowTemplate?: any;
+      /** Enables the use of jquery UI reaggable/droppable plugin. requires jqueryUI to work if enabled.
+      Useful if you want drag + drop but your users insist on crappy browsers. */
+      jqueryUIDraggable?: boolean;
 
-        /** Enables the use of jquery UI reaggable/droppable plugin. requires jqueryUI to work if enabled.
-        Useful if you want drag + drop but your users insist on crappy browsers. */
-        jqueryUIDraggable?: boolean;
+      /** Enable the use jqueryUIThemes */
+      jqueryUITheme?: boolean;
 
-        /** Enable the use jqueryUIThemes */
-        jqueryUITheme?: boolean;
+      /** Prevent unselections when in single selection mode. */
+      keepLastSelected?: boolean;
 
-        /** Prevent unselections when in single selection mode. */
-        keepLastSelected?: boolean;
+      /** Maintains the column widths while resizing.
+      Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */
+      maintainColumnRatios?: any;
 
-        /** Maintains the column widths while resizing.
-        Defaults to true when using *'s or undefined widths. Can be ovverriden by setting to false. */
-        maintainColumnRatios?: any;
+      /** Set this to false if you only want one item selected at a time */
+      multiSelect?: boolean;
 
-        /** Set this to false if you only want one item selected at a time */
-        multiSelect?: boolean;
+      /**  pagingOptions - */
+      pagingOptions?: PagingOptions;
 
-        /**  pagingOptions - */
-        pagingOptions?: PagingOptions;
+      /** Array of plugin functions to register in ng-grid */
+      plugins?: Plugin<EntityType>[];
 
-        /** Array of plugin functions to register in ng-grid */
-        plugins?: Plugin<EntityType>[];
+      /** Row height of rows in grid. */
+      rowHeight?: number;
 
-        /** Row height of rows in grid. */
-        rowHeight?: number;
+      /** Define a row template to customize output. See github wiki for more details. */
+      rowTemplate?: string | JQueryGenericPromise<string>;
 
-        /** Define a row template to customize output. See github wiki for more details. */
-        rowTemplate?: any;
+      /** Defines the binding to select all at once */
+      selectAllState?: KnockoutObservable<boolean>;
 
-        /** all of the items selected in the grid. In single select mode there will only be one item in the array. */
-        selectedItems?: KnockoutObservableArray<any>;
+      /** all of the items selected in the grid. In single select mode there will only be one item in the array. */
+      selectedItems?: KnockoutObservableArray<any>;
 
-        /** Disable row selections by clicking on the row and only when the checkbox is clicked. */
-        selectWithCheckboxOnly?: boolean;
+      /** Disable row selections by clicking on the row and only when the checkbox is clicked. */
+      selectWithCheckboxOnly?: boolean;
 
-        /** Enables menu to choose which columns to display and group by.
-        If both showColumnMenu and showFilter are false the menu button will not display.*/
-        showColumnMenu?: boolean;
+      /** Enables menu to choose which columns to display and group by.
+      If both showColumnMenu and showFilter are false the menu button will not display.*/
+      showColumnMenu?: boolean;
 
-        /** Enables display of the filterbox in the column menu.
-        If both showColumnMenu and showFilter are false the menu button will not display.*/
-        showFilter?: boolean;
+      /** Enables display of the filterbox in the column menu.
+      If both showColumnMenu and showFilter are false the menu button will not display.*/
+      showFilter?: boolean;
 
-        /** Show the dropzone for drag and drop grouping */
-        showGroupPanel?: boolean;
+      /** Show the dropzone for drag and drop grouping */
+      showGroupPanel?: boolean;
 
-        /** Define a sortInfo object to specify a default sorting state.
-        You can also observe this variable to utilize server-side sorting (see useExternalSorting).
-        Syntax is sortinfo: { fields: ['fieldName1',' fieldName2'], direction: 'ASC'/'asc' || 'desc'/'DESC'}*/
-        sortInfo?: any;
+      /** Define a sortInfo object to specify a default sorting state.
+      You can also observe this variable to utilize server-side sorting (see useExternalSorting).
+      Syntax is sortinfo: { fields: ['fieldName1',' fieldName2'], direction: 'ASC'/'asc' || 'desc'/'DESC'}*/
+      sortInfo?: SortInfo | KnockoutObservable<SortInfo>;
 
-        /** Set the tab index of the Vieport. */
-        tabIndex?: number;
+      /** Set the tab index of the Vieport. */
+      tabIndex?: number;
 
-        /** Prevents the internal sorting from executing.
-        The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/
-        useExternalSorting?: boolean;
-    }
+      /** Prevents the internal sorting from executing.
+      The sortInfo object will be updated with the sorting information so you can handle sorting (see sortInfo)*/
+      useExternalSorting?: boolean;
+   }
 
-    interface ColumnDef {
-        /** The string name of the property in your data model you want that column to represent. Can also be a property path on your data model. 'foo.bar.myField', 'Name.First', etc.. */
-        field: string;
+   type Direction = "asc" | "desc";
 
-        /** Sets the pretty display name of the column. default is the field given */
-        displayName?: string;
+   interface SortInfo {
+      /** Which column to sort */
+      column: SortColumn;
 
-        /** Sets the width of the column. Can be a fixed width in pixels as an int (42), string px('42px'), percentage string ('42%'), weighted asterisks (width divided by total number of *'s is all column definition widths) See github wiki for more details. */
-        width?: string;
-    }
+      /** Which direction to sort */
+      direction: Direction;
+   }
+   
+   interface SortColumn {
+      /** The string name of the property in your data model you want that column to represent. Can also be a property path on your data model. 'foo.bar.myField', 'Name.First', etc.. */
+      field: string;
 
-    interface FilterOptions {
-        filterText?: string;
-        useExternalFilter?: boolean;
-    }
+      /** Sets the sort function for the column. Useful when you have data that is formatted in an unusal way or if you want to sort on an underlying data type. Example: function(a,b){return a > b} */
+      sortingAlgorithm?: ((a:any, b:any) => number);
+   }
 
-    interface PagingOptions {
-        /**  pageSizes: list of available page sizes.  */
-        pageSizes?: number[];
-        /** pageSize: currently selected page size.  */
-        pageSize?: number;
-        /** totalServerItems: Total items are on the server.  */
-        totalServerItems?: number;
-        /** currentPage: the uhm... current page. */
-        currentPage?: number;
-    }
+   interface ColumnDef {
+      /** Appends a css class for the column cells */
+      cellClass?:string;
+
+      /**
+       * A function which takes the value of the cell and returns the display value. Useful when your data model has an underlying value which you need to convert to a human readable format.
+       * @param val 
+       * @returns the display value
+       * @example function(unixTimeTicks) { return new Date(unixTimeTicks); }
+       */
+      cellFormatter?(val:any): string;
+
+      /**Sets the cell template for the column. See github wiki for more details.*/
+      cellTemplate?: string | JQueryGenericPromise<string>;
+
+      /** Sets the pretty display name of the column. default is the field given */
+      displayName?: string;
+
+      /** The string name of the property in your data model you want that column to represent. Can also be a property path on your data model. 'foo.bar.myField', 'Name.First', etc.. */
+      field: string;
+
+      /** Sets the template for the column header cell. See github wiki for more details. */
+      headerCellTemplate?: string | JQueryGenericPromise<string>;
+
+      /** Appends a css class for the column header. */
+      headerClass?: string;
+
+      /**Sets the maximum width of the column.*/
+      maxWidth?: number;
+
+      /**Whether or not column is resizable. */
+      resizable?: boolean;
+
+      /**Whether or not column is sortable. */
+      sortable?: boolean;
+
+      /** Sets the sort function for the column. Useful when you have data that is formatted in an unusal way or if you want to sort on an underlying data type. Example: function(a,b){return a > b} */
+      sortFn?: ((a: any, b: any) => number);
+
+      /** Sets the width of the column. Can be a fixed width in pixels as an int (42), string px('42px'), percentage string ('42%'), weighted asterisks (width divided by total number of *'s is all column definition widths) See github wiki for more details. */
+      width?: string;
+   }
+
+   interface FilterOptions {
+      /** Variable to contain the current search filter */
+      filterText?: KnockoutObservable<string>;
+
+      /** Is the filtering internal or does it require a server visit. You should subscribe to filterText to refresh */
+      useExternalFilter?: boolean;
+
+      /** Number of seconds to throttle before reapplying search */
+      filterThrottle?: number;
+   }
+
+   interface PagingOptions {
+      /**  pageSizes: list of available page sizes.  */
+      pageSizes?: KnockoutObservableArray<number>;
+
+      /** pageSize: currently selected page size.  */
+      pageSize?: KnockoutObservable<number>;
+
+      /** totalServerItems: Total items are on the server.  */
+      totalServerItems?: KnockoutObservable<number>;
+
+      /** currentPage: the uhm... current page. */
+      currentPage?: KnockoutObservable<number>;
+   }
 }
 
 interface IKg {
    domUtilityService: kg.DomUtilityService;
+
+   /** Default grid template */
+   defaultGridTemplate():string;
+
+   /** Default row template. Can be overriden in GridOptions.rowTemplate */
+   defaultRowTemplate(): string;
+
+   /** Default cell template. Can be overriden in GridOptions.cellTemplate */
+   defaultCellTemplate(): string;
+
+   /** Default aggregate template */
+   aggregateTemplate(): string;
+
+   /** Default headerrow template. Can be overriden in GridOptions.headerRowTemplate */
+   defaultHeaderRowTemplate(): string;
+
+   /** Default headercell template. Can be overriden in GridOptions.headerCellTemplate */
+   defaultHeaderCellTemplate():string;
 }
 
 declare var kg: IKg;
@@ -199,4 +277,3 @@ declare var kg: IKg;
 declare module "kg" {
    export = kg;
 }
-
diff --git a/koa/koa-tests.ts b/koa/koa-tests.ts
index e984364973..71814fe4fc 100644
--- a/koa/koa-tests.ts
+++ b/koa/koa-tests.ts
@@ -9,6 +9,7 @@ app.use((ctx, next) => {
     const end: any = new Date();
     const ms = end - start;
     console.log(`${ctx.method} ${ctx.url} - ${ms}ms`);
+    ctx.assert(true, 404, 'Yep!');
   });
 });
 
diff --git a/koa/koa.d.ts b/koa/koa.d.ts
index 922b243511..b005067b1f 100644
--- a/koa/koa.d.ts
+++ b/koa/koa.d.ts
@@ -38,7 +38,7 @@ declare module "koa" {
         toJSON(): any;
         inspect(): any;
         throw(code?: any, message?: any): void;
-        assert(): void;
+        assert(test: any, status: number, message: string): void;
     }
 
     export interface Request {
diff --git a/leaflet-markercluster/leaflet-markercluster.d.ts b/leaflet-markercluster/leaflet-markercluster.d.ts
index c9a3140fda..7d8757be03 100644
--- a/leaflet-markercluster/leaflet-markercluster.d.ts
+++ b/leaflet-markercluster/leaflet-markercluster.d.ts
@@ -51,9 +51,10 @@ declare namespace L {
 
       /*
       * The maximum radius that a cluster will cover from the central marker (in pixels). Default 80.
-      * Decreasing will make more, smaller clusters.
+      * Decreasing will make more, smaller clusters. You can also use a function that accepts 
+      * the current map zoom and returns the maximum cluster radius in pixels
       */
-      maxClusterRadius?: number;
+      maxClusterRadius?: number | ((zoom: number) => number);
 
       /*
       * Options to pass when creating the L.Polygon(points, options) to show the bounds of a cluster.
@@ -82,11 +83,21 @@ declare namespace L {
       * Function used to create the cluster icon
       */
       iconCreateFunction?: any;
+
+      /*
+      * Boolean to split the addLayers processing in to small intervals so that the page does not freeze.
+      */
+      chunkedLoading?: boolean;
+
+      /*
+      * Time delay (in ms) between consecutive periods of processing for addLayers. Default to 50ms.
+      */
+      chunkDelay?: number;
     }
 
     export class MarkerClusterGroup extends FeatureGroup<ILayer> {
-      initialize(): void;
-      initialize(options: MarkerClusterGroupOptions): void;
+      constructor();
+      constructor(options: MarkerClusterGroupOptions);
 
       /*
       * Bulk methods for adding and removing markers and should be favoured over the
@@ -121,5 +132,11 @@ declare namespace L {
       * Returns the array of total markers contained within that cluster.
       */
       getAllChildMarkers(): Marker[];
+
+      /*
+      * Zooms to show the given marker (spiderfying if required), 
+      * calls the callback when the marker is visible on the map.
+      */	  
+      zoomToShowLayer(layer: any, callback: () => void): void;
     }
 }
diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
index 04e8a44a36..94cbe8499a 100644
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -1,11 +1,14 @@
-// Type definitions for Leaflet.js 0.7.3
+// Type definitions for Leaflet.js 1.0.0
 // Project: https://github.com/Leaflet/Leaflet
 // Definitions by: Vladimir Zotov <https://github.com/rgripper>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/// <reference path='../geojson/geojson.d.ts' />
+
 declare namespace L {
     type LatLngExpression = LatLng | number[] | ({ lat: number; lng: number })
     type LatLngBoundsExpression = LatLngBounds | LatLngExpression[];
+    type PositionString = 'topleft' | 'topright' | 'bottomleft' | 'bottomright';
 }
 
 declare namespace L {
@@ -16,7 +19,7 @@ declare namespace L {
           * The position of the control (one of the map corners). See control positions.
           * Default value: 'bottomright'.
           */
-        position?: string;
+        position?: PositionString;
 
         /**
           * The HTML text shown before the attributions. Pass false to disable.
@@ -219,7 +222,7 @@ declare namespace L {
         /**
           * Returns a GeoJSON representation of the circle (GeoJSON Point Feature).
           */
-        toGeoJSON(): any;
+        toGeoJSON(): GeoJSON.Feature<GeoJSON.Point>;
 
     }
 }
@@ -254,11 +257,6 @@ declare namespace L {
           * Sets the radius of a circle marker. Units are in pixels.
           */
         setRadius(radius: number): CircleMarker;
-
-        /**
-          * Returns a GeoJSON representation of the circle marker (GeoJSON Point Feature).
-          */
-        toGeoJSON(): any;
     }
 }
 
@@ -343,12 +341,12 @@ declare namespace L {
         /**
           * Sets the position of the control. See control positions.
           */
-        setPosition(position: string): Control;
+        setPosition(position: PositionString): Control;
 
         /**
           * Returns the current position of the control.
           */
-        getPosition(): string;
+        getPosition(): PositionString;
 
         /**
           * Adds the control to the map.
@@ -400,7 +398,7 @@ declare namespace L {
               *
               * Default value: 'topright'.
               */
-            position?: string; // 'topleft' | 'topright' | 'bottomleft' | 'bottomright'
+            position?: PositionString;
 
             /**
              * The text set on the zoom in button.
@@ -550,7 +548,7 @@ declare namespace L {
           * positions.
           * Default value: 'topright'.
           */
-        position?: string;
+        position?: PositionString;
 
     }
 }
@@ -1709,8 +1707,9 @@ declare namespace L {
 
         /**
           * Returns a GeoJSON representation of the layer group (GeoJSON FeatureCollection).
+          * Note: Descendent classes MultiPolygon & MultiPolyLine return `Feature`s, not `FeatureCollection`s
           */
-        toGeoJSON(): any;
+        toGeoJSON(): GeoJSON.FeatureCollection<GeoJSON.GeometryObject>|GeoJSON.Feature<GeoJSON.MultiLineString|GeoJSON.MultiPolygon>;
 
         ////////////
         ////////////
@@ -1739,7 +1738,7 @@ declare namespace L {
           *
           * Default value: 'topright'.
           */
-        position?: string;
+        position?: PositionString;
 
         /**
           * If true, the control will be collapsed into an icon and expanded on mouse hover
@@ -2000,7 +1999,7 @@ declare namespace L {
         export function closestPointOnSegment(p: Point, p1: Point, p2: Point): Point;
 
         /**
-          * Clips the segment a to b by rectangular bounds. Used by Leaflet to only show 
+          * Clips the segment a to b by rectangular bounds. Used by Leaflet to only show
           * polyline points that are on the screen or near, increasing performance. Returns
           * either false or a length-2 array of clipped points.
           */
@@ -2734,6 +2733,22 @@ declare namespace L.Map {
          * If true, it will delay moveend event so that it doesn't happen many times in a row.
          */
         debounceMoveend?: boolean;
+
+        /**
+         * Duration of animated panning, in seconds.
+         */
+        duration?: number;
+
+        /**
+         * The curvature factor of panning animation easing (third parameter of the Cubic Bezier curve).
+         * 1.0 means linear animation, the less the more bowed the curve.
+         */
+        easeLinearity?: number;
+
+        /**
+         * If true, panning won't fire movestart event on start (used internally for panning inertia).
+         */
+        noMoveStart?: boolean;
     }
 
     export interface FitBoundsOptions extends ZoomPanOptions {
@@ -2921,7 +2936,7 @@ declare namespace L {
         /**
           * Returns a GeoJSON representation of the marker (GeoJSON Point Feature).
           */
-        toGeoJSON(): any;
+        toGeoJSON(): GeoJSON.Feature<GeoJSON.Point>;
 
         /**
           * Marker dragging handler (by both mouse and touch).
@@ -3081,7 +3096,7 @@ declare namespace L {
         /**
           * Returns a GeoJSON representation of the multipolygon (GeoJSON MultiPolygon Feature).
           */
-        toGeoJSON(): any;
+        toGeoJSON(): GeoJSON.Feature<GeoJSON.MultiPolygon>;
     }
 }
 
@@ -3122,7 +3137,7 @@ declare namespace L {
         /**
           * Returns a GeoJSON representation of the multipolyline (GeoJSON MultiLineString Feature).
           */
-        toGeoJSON(): any;
+        toGeoJSON(): GeoJSON.Feature<GeoJSON.MultiLineString>;
     }
 }
 
@@ -3384,7 +3399,7 @@ declare namespace L {
         className?: string;
 
 	/**
-	 * Sets the radius of a circle marker. 
+	 * Sets the radius of a circle marker.
 	 */
 	radius?: number;
 
@@ -3543,7 +3558,7 @@ declare namespace L {
         /**
           * Returns a GeoJSON representation of the polyline (GeoJSON LineString Feature).
           */
-        toGeoJSON(): any;
+        toGeoJSON(): GeoJSON.Feature<GeoJSON.LineString>;
     }
 }
 
@@ -3858,7 +3873,7 @@ declare namespace L {
           * The position of the control (one of the map corners). See control positions.
           * Default value: 'bottomleft'.
           */
-        position?: string;
+        position?: PositionString;
 
         /**
           * Maximum width of the control in pixels. The width is set dynamically to show
diff --git a/linq/linq-tests.ts b/linq/linq-tests.ts
index fb9c3f3d6e..d30ccc8f8c 100644
--- a/linq/linq-tests.ts
+++ b/linq/linq-tests.ts
@@ -30,7 +30,7 @@ describe("Linq.js tests", function () {
     it("Grouping Methods", function () {
         expect(Enumerable.From(["a","aa","aaa","a","a","aaa"])
             .GroupBy((item:string) => item.length)
-            .Select((g: linq.Grouping<string>) => { return { key: g.Key(), count: g.Count() }; })
+            .Select((g: linq.Grouping<number, string>) => { return { key: g.Key(), count: g.Count() }; })
             .OrderBy(g => g.key)
             .Select(g => g.key+":"+g.count)
             .ToString(",")).toBe("1:3,2:1,3:2");
diff --git a/linq/linq.d.ts b/linq/linq.d.ts
index facd5d5901..f7417fc8da 100644
--- a/linq/linq.d.ts
+++ b/linq/linq.d.ts
@@ -49,8 +49,10 @@ declare namespace linq {
         Scan(seed: any, func: string, resultSelector?: string): Enumerable<any>;
         Select<TResult>(selector: ($: T, i: number) => TResult): Enumerable<TResult>;
         Select(selector: string): Enumerable<any>;
-        SelectMany(collectionSelector: ($: any, i: number) => any[], resultSelector?: ($: any, item: any) => any): Enumerable<any>;
-        SelectMany(collectionSelector: ($: any, i: number) => Enumerable<any>, resultSelector?: ($: any, item: any) => any): Enumerable<any>;
+        SelectMany<TResult>(collectionSelector: ($: T, i: number) => TResult[]): Enumerable<TResult>;
+        SelectMany<TResult>(collectionSelector: ($: T, i: number) => Enumerable<TResult>): Enumerable<TResult>;
+        SelectMany<TCollectionItem, TResult>(collectionSelector: ($: T, i: number) => TCollectionItem[], resultSelector: ($: T, item: TCollectionItem) => TResult): Enumerable<TResult>;
+        SelectMany<TCollectionItem, TResult>(collectionSelector: ($: T, i: number) => Enumerable<TCollectionItem>, resultSelector: ($: T, item: TCollectionItem) => TResult): Enumerable<TResult>;
         SelectMany(collectionSelector: string, resultSelector?: string): Enumerable<any>;
         Where(predicate: ($ : T, i: number) => boolean): Enumerable<T>;
         Where(predicate: string): Enumerable<any>;
@@ -170,12 +172,12 @@ declare namespace linq {
         LastIndexOf(item: T): number;
         // Convert Methods
         ToArray(): T[];
-        ToLookup(keySelector: ($: T) => any, elementSelector?: ($: T) => any, compareSelector?: (key: any) => any): Lookup<T>;
-        ToLookup(keySelector: string, elementSelector?: string, compareSelector?: string): Lookup<T>;
+        ToLookup<TKey, TValue>(keySelector: ($: T) => TKey, elementSelector?: ($: T) => TValue, compareSelector?: (key: TKey) => any): Lookup<TKey, TValue>;
+        ToLookup(keySelector: string, elementSelector?: string, compareSelector?: string): Lookup<any, any>;
         ToObject(keySelector: ($: T) => string, elementSelector: ($: T) => any): any;
         ToObject(keySelector: string, elementSelector: string): any;
-        ToDictionary(keySelector: ($: T) => any, elementSelector: ($: T) => any, compareSelector?: (key: T) => any): Dictionary<T>;
-        ToDictionary(keySelector: string, elementSelector: string, compareSelector?: string): Dictionary<T>;
+        ToDictionary<TKey, TValue>(keySelector: ($: T) => TKey, elementSelector: ($: T) => TValue, compareSelector?: (key: TKey) => any): Dictionary<TKey, TValue>;
+        ToDictionary(keySelector: string, elementSelector: string, compareSelector?: string): Dictionary<any, any>;
         ToJSON(replacer?: (key: any, value: any) => any, space?: number): string;
         ToJSON(replacer?: string, space?: number): string;
         ToString(separator?: string, selector?: ($: T) =>any): string;
@@ -211,26 +213,26 @@ declare namespace linq {
         ThenByDescending(keySelector: string): OrderedEnumerable<T>;
     }
 
-    interface Grouping<T> extends Enumerable<T> {
-        Key(): any;
+    interface Grouping<TKey, T> extends Enumerable<T> {
+        Key(): TKey;
     }
 
-    interface Lookup<TValue> {
+    interface Lookup<TKey, TValue> {
         Count(): number;
-        Get(key: any): Enumerable<TValue>;
-        Contains(key: any): boolean;
-        ToEnumerable(): Enumerable<TValue>;
+        Get(key: TKey): Enumerable<TValue>;
+        Contains(key: TKey): boolean;
+        ToEnumerable(): Enumerable<Grouping<TKey, TValue>>;
     }
 
-    interface Dictionary<TValue> {
-        Add(key: any, value: TValue): void;
-        Get(key: any): any;
-        Set(key: any, value: TValue): boolean;
-        Contains(key: any): boolean;
+    interface Dictionary<TKey, TValue> {
+        Add(key: TKey, value: TValue): void;
+        Get(key: TKey): TValue;
+        Set(key: TKey, value: TValue): boolean;
+        Contains(key: TKey): boolean;
         Clear(): void;
-        Remove(key: any): void;
+        Remove(key: TKey): void;
         Count(): number;
-        ToEnumerable(): Enumerable<TValue>;
+        ToEnumerable(): Enumerable<KeyValuePair<TKey, TValue>>;
     }
 
     interface KeyValuePair<TKey, TValue> {
diff --git a/lodash/lodash-3.10.d.ts b/lodash/lodash-3.10.d.ts
index b92de15c89..3948215468 100644
--- a/lodash/lodash-3.10.d.ts
+++ b/lodash/lodash-3.10.d.ts
@@ -7732,6 +7732,53 @@ declare module _ {
             thisArg?: any): TResult;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+        * @see _.reduce
+        **/
+        reduce<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            accumulator: TResult,
+            thisArg?: any): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            thisArg?: any): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        inject<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            accumulator: TResult,
+            thisArg?: any): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        inject<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            thisArg?: any): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        foldl<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            accumulator: TResult,
+            thisArg?: any): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        foldl<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            thisArg?: any): LoDashExplicitObjectWrapper<TResult>;
+    }
+
     //_.reduceRight
     interface LoDashStatic {
         /**
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 115cc4a1e6..f1772191cd 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -8547,6 +8547,21 @@ declare module _ {
             callback: MemoIterator<TValue, TResult>): TResult;
     }
 
+    interface LoDashExplicitObjectWrapper<T> {
+        /**
+        * @see _.reduce
+        **/
+        reduce<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>,
+            accumulator: TResult): LoDashExplicitObjectWrapper<TResult>;
+
+        /**
+        * @see _.reduce
+        **/
+        reduce<TValue, TResult>(
+            callback: MemoIterator<TValue, TResult>): LoDashExplicitObjectWrapper<TResult>;
+    }
+
     //_.reduceRight
     interface LoDashStatic {
         /**
diff --git a/mCustomScrollbar/mCustomScrollbar-tests.ts b/mCustomScrollbar/mCustomScrollbar-tests.ts
index 7dcf793564..9c5f030679 100644
--- a/mCustomScrollbar/mCustomScrollbar-tests.ts
+++ b/mCustomScrollbar/mCustomScrollbar-tests.ts
@@ -9,7 +9,8 @@ class SimpleTest {
 
         this.element.mCustomScrollbar({
             scrollButtons: {
-                enable: true
+                enable: true,
+                scrollAmount: 2
             }
         });
     }
@@ -22,38 +23,78 @@ class SimpleTestAllParams {
         this.element = $(".content");
 
         this.element.mCustomScrollbar({
-            setWidth: false,
-            setHeight: false,
+            setWidth: 22,
+            setHeight: "40%",
+            setTop: 0,
+            setLeft: 22,
             axis: "y",
+            scrollbarPosition: "inside",
             scrollInertia: 950,
-            mouseWheel: true,
-            mouseWheelPixels: "auto",
             autoDraggerLength: true,
             autoHideScrollbar: false,
+            autoExpandScrollbar: false,
+            alwaysShowScrollbar: 0,
+            snapAmount: [3,3],
+            snapOffset: 3,
+            mouseWheel: {
+                enable: true,
+                scrollAmount: 1,
+                axis:"x",
+                preventDefault: false,
+                deltaFactor:12,
+                normalizeDelta:true,
+                invert: false,
+                disableOver: ["select","option"]
+
+            },
             scrollButtons: {
                 enable: false,
-                scrollType: "continuous",
-                scrollSpeed: "auto",
-                scrollAmount: 40
+                scrollType: "stepped",
+                scrollAmount: 40,
+                tabindex: 33,
+            },
+            keyboard:{
+                enable: true,
+                scrollAmount:5,
+                scrollType:"stepless"
             },
             advanced: {
                 updateOnBrowserResize: true,
                 updateOnContentResize: false,
+                updateOnImageLoad: true,
+                updateOnSelectorChange: "ul li",
+                extraDraggableSelectors: ".myClass",
+                releaseDraggableSelectors: ".myClass",
+                autoUpdateTimeout:60,
                 autoExpandHorizontalScroll: false,
-                autoScrollOnFocus: true,
-                normalizeMouseWheelDelta: false
+                autoScrollOnFocus: "input",
             },
             contentTouchScroll: true,
+            documentTouchScroll: false,
+
             callbacks: {
+                onCreate: () => { },
+                onInit: () => { },
                 onScrollStart: () => { },
                 onScroll: () => { },
                 onTotalScroll: () => { },
                 onTotalScrollBack: () => { },
                 onTotalScrollOffset: 0,
                 onTotalScrollBackOffset: 0,
-                whileScrolling: () => { }
+                whileScrolling: () => { },
+                alwaysTriggerOffsets: false,
+                onOverflowY: () => { },
+                onOverflowX: () => { },
+                onOverflowYNone: () => {},
+                onOverflowXNone: () => {},
+                onBeforeUpdate: () => {},
+                onUpdate: () => {},
+                onImageLoad: () => {},
+                onSelectorChange: () => {},
             },
-            theme: "light"
+            theme: "light",
+            live: true,
+            liveSelector: ".myClass"
         });
     }
 }
diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts
index 08e532d7bf..aa088d6f5c 100644
--- a/mCustomScrollbar/mCustomScrollbar.d.ts
+++ b/mCustomScrollbar/mCustomScrollbar.d.ts
@@ -10,16 +10,35 @@ declare namespace MCustomScrollbar {
         /**
         * Set the width of your content (overwrites CSS width), value in pixels (integer) or percentage (string)
         */
-        setWidth?: any;
+        setWidth?: boolean|number|string;
         /**
         * Set the height of your content (overwirtes CSS height), value in pixels (integer) or percentage (string)
         */
-        setHeight?: any;
+        setHeight?: boolean|number|string;
+        /**
+        * Set the initial css top property of content, accepts string values (css top position).
+        * Example: setTop: "-100px".
+        */
+        setTop? : number|string;
+        /**
+        * Set the initial css top property of content, accepts string values (css top position).
+        * Example: setTop: "-100px".
+        */
+        setLeft? : number|string;
         /**
          * Define content’s scrolling axis (the type of scrollbars added to the element: vertical and/of horizontal).
-         * Available values: "y", "x", "yx". y -vertical, x - horizontal
+         * Available values: "y", "x", "yx". y -vertical, x - horizontal, yx - vertical and horizontal
          */
-        axis?: string;
+        axis?: "x"|"y"|"yx";
+        /**
+        * Set the position of scrollbar in relation to content.
+        * Available values: "inside", "outside".
+        * Setting scrollbarPosition: "inside" (default) makes scrollbar appear inside the element. 
+        * Setting scrollbarPosition: "outside" makes scrollbar appear outside the element. 
+        * Note that setting the value to "outside" requires your element (or parent elements) 
+        * to have CSS position: relative (otherwise the scrollbar will be positioned in relation to document’s root element).
+        */
+        scrollbarPosition?: "inside"|"outside";
         /**
         * Always keep scrollbar(s) visible, even when there’s nothing to scroll.
         * 0 – disable (default)
@@ -28,6 +47,18 @@ declare namespace MCustomScrollbar {
         */
         alwaysShowScrollbar?: number;
         /**
+        * Make scrolling snap to a multiple of a fixed number of pixels. Useful in cases like scrolling tabular data, 
+        * image thumbnails or slides and you need to prevent scrolling from stopping half-way your elements. 
+        * Note that your elements must be of equal width or height in order for this to work properly.
+        * To set different values for vertical and horizontal scrolling, use an array: [y,x]
+        */
+        snapAmount?: number|[number,number];
+        /**
+        * Set an offset (in pixels) for the snapAmount option. Useful when for example you need to offset the 
+        * snap amount of table rows by the table header.
+        */
+        snapOffset?: number;
+        /**
         * Enable or disable auto-expanding the scrollbar when cursor is over or dragging the scrollbar.
         */
         autoExpandScrollbar?: boolean;
@@ -47,7 +78,7 @@ declare namespace MCustomScrollbar {
              * Set the mouse-wheel scrolling amount (in pixels).
              * The default value "auto" adjusts scrolling amount according to scrollable content length.
              */
-            scrollAmount?: number;
+            scrollAmount?: "auto"|number;
             /**
              * Define the mouse-wheel scrolling axis when both vertical and horizontal scrollbars are present.
              * Set axis: "y" (default) for vertical or axis: "x" for horizontal scrolling.
@@ -76,7 +107,27 @@ declare namespace MCustomScrollbar {
              * Set the tags that disable mouse-wheel when cursor is over them.
              * Default value: ["select","option","keygen","datalist","textarea"]
              */
-            disableOver?: string[]
+            disableOver?: string[];
+        }
+        /**
+        * Keyboard support 
+        */
+        keyboard?:{
+            /**
+             * Enable or disable content scrolling via keyboard.
+             */
+            enable?: boolean;
+            /**
+             * Set the keyboard arrows scrolling amount (in pixels). 
+             * The default value "auto" adjusts scrolling amount according to scrollable content length.
+             */
+            scrollAmount?: "auto"|number;
+            /**
+            * Define the buttons scrolling type/behavior.
+            * scrollType: "stepless" – continuously scroll content while pressing the button (default)
+            * scrollType: "stepped" – each button click scrolls content by a certain amount (defined in scrollAmount option above)
+            */
+            scrollType?: "stepless"|"stepped";
         }
         /**
         * Mouse wheel scrolling pixels amount, value in pixels (integer) or "auto" (script calculates and sets pixels amount according to content length)
@@ -96,19 +147,21 @@ declare namespace MCustomScrollbar {
              */
             enable?: boolean;
             /**
-            * Scroll buttons scroll type, values: "continuous" (scroll continuously while pressing the button), "pixels" (scrolls by a fixed number of pixels on each click")
+            * Define the buttons scrolling type/behavior.
+            * scrollType: "stepless" – continuously scroll content while pressing the button (default)
+            * scrollType: "stepped" – each button click scrolls content by a certain amount (defined in scrollAmount option above)
             */
-            scrollType?: string;
+            scrollType?: "stepless"|"stepped";
             /**
-            * Scroll buttons continuous scrolling speed, integer value or "auto" (script calculates and sets the speed according to content length)
+            * Set a tabindex value for the buttons.
             */
-            scrollSpeed?: number | string;
+            tabindex?: number;
             /**
             * Scroll buttons pixels scrolling amount, value in pixels or "auto"
             */
-            scrollAmount?: number | string;
+            scrollAmount?: "auto"|number ;
         }
-    advanced?: {
+        advanced?: {
             /**
             * Update scrollbars on browser resize (for fluid content blocks and layouts based on percentages), values: true, false. Set to false only when you content has fixed dimensions
             */
@@ -119,27 +172,75 @@ declare namespace MCustomScrollbar {
             */
             updateOnContentResize?: boolean;
             /**
+            * Update scrollbar(s) automatically each time an image inside the element is fully loaded.
+            * Default value is auto which triggers the function only on "x" and "yx" axis (if needed).
+            * The value should be true when your content contains images and you need the function to trigger on any axis.
+            */
+            updateOnImageLoad?: "auto"|boolean;
+            /**
+            * Add extra selector(s) that’ll release scrollbar dragging upon mouseup, pointerup, touchend etc.
+            * Example: extraDraggableSelectors: ".myClass, #myID"
+            */
+            extraDraggableSelectors?: string;
+            /**
+            * Add extra selector(s) that’ll allow scrollbar dragging upon mousemove/up, pointermove/up, touchend etc.
+            * Example: releaseDraggableSelectors: ".myClass, #myID"
+            */
+            releaseDraggableSelectors?: string;
+            /**
+            * Set the auto-update timeout in milliseconds.
+            * Default timeout: 60
+            */            
+            autoUpdateTimeout?: number;
+            /**
+            * Update scrollbar(s) automatically when the amount and size of specific selectors changes.
+            * Useful when you need to update the scrollbar(s) automatically, each time a type of element is added, removed or changes its size.
+            * For example, setting updateOnSelectorChange: "ul li" will update scrollbars each time list-items inside the element are changed.
+            * Setting the value to true, will update scrollbars each time any element is changed.
+            * To disable (default) set to false.
+            */
+            updateOnSelectorChange?: string|boolean;
+            /**
             * Auto-expanding content's width on horizontal scrollbars, values: true, false. Set to true if you have horizontal scrollbr on content that change on-the-fly. Demo contains
             * blocks with images and horizontal scrollbars that use this option parameter
             */
             autoExpandHorizontalScroll?: boolean;
             /**
-            * Auto-scrolling on elements that have focus (e.g. scrollbar automatically scrolls to form text fields when the TAB key is pressed), values: true, false
+            * Set the list of elements/selectors that will auto-scroll content to their position when focused.
+            * For example, when pressing TAB key to focus input fields, if the field is out of the viewable area the content 
+            * will scroll to its top/left position (same bahavior with browser’s native scrollbar).
+            * To completely disable this functionality, set autoScrollOnFocus: false.
+            * Default:
+            *   "input,textarea,select,button,datalist,keygen,a[tabindex],area,object,[contenteditable='true']"
             */
-            autoScrollOnFocus?: boolean;
+            autoScrollOnFocus?: boolean|string;
             /**
             * Normalize mouse wheel delta (-1/1), values: true, false
             */
             normalizeMouseWheelDelta?: boolean;
         }
-    /**
-    * Additional scrolling method by touch-swipe content (for touch enabled devices), value: true, false
-    */
-    contentTouchScroll?: boolean;
+        /**
+        * Enable or disable content touch-swipe scrolling for touch-enabled devices.
+        * To completely disable, set contentTouchScroll: false.
+        * Integer values define the axis-specific minimum amount required for scrolling momentum (default: 25).
+        */
+        contentTouchScroll?: boolean|number;
+        /**
+         * Enable or disable document touch-swipe scrolling for touch-enabled devices.
+         */
+        documentTouchScroll?: boolean;
         /**
         * All of the following callbacks option have examples in the callback demo - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/callbacks_example.html
         */
         callbacks?: {
+            /**
+            * A function to call when plugin markup is created.
+            */
+            onCreate?: () => void;
+            /**
+            * A function to call when scrollbars have initialized
+            */
+            onInit?: () => void;
             /**
             * User defined callback function, triggered on scroll start event. You can call your own function(s) each time a scroll event begins
             */
@@ -176,11 +277,56 @@ declare namespace MCustomScrollbar {
             * Set alwaysTriggerOffsets: false when you need to trigger onTotalScroll and onTotalScrollBack callbacks once, each time scroll end or beginning is reached.
             */
             alwaysTriggerOffsets?: boolean;
+            /**
+            * A function to call when content becomes long enough and vertical scrollbar is added.
+            */
+            onOverflowY?: () => void;
+            /**
+            * A function to call when content becomes wide enough and horizontal scrollbar is added.
+            */
+            onOverflowX?: () => void;
+            /**
+            * A function to call when content becomes short enough and vertical scrollbar is removed.
+            */
+            onOverflowYNone?: () => void;
+            /**
+            * A function to call when content becomes narrow enough and horizontal scrollbar is removed.
+            */
+            onOverflowXNone?: () => void;
+            /**
+            * A function to call right before scrollbar(s) are updated.
+            */
+            onBeforeUpdate?: () => void;
+            /**
+            * A function to call when scrollbar(s) are updated.
+            */
+            onUpdate?: () => void;
+            /**
+            * A function to call each time an image inside the element is fully loaded and scrollbar(s) are updated.
+            */
+            onImageLoad?: () => void;
+            /**
+            * A function to call each time a type of element is added, removed or changes its size and scrollbar(s) are updated.
+            */
+            onSelectorChange?: () => void;
         }
-    /**
-    * Set a scrollbar ready-to-use theme. See themes demo for all themes - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/scrollbar_themes_demo.html
-    */
-    theme?: string;
+        /**
+        * Set a scrollbar ready-to-use theme. See themes demo for all themes - http://manos.malihu.gr/tuts/custom-scrollbar-plugin/scrollbar_themes_demo.html
+        */
+        theme?: string;
+        /**
+        * Enable or disable applying scrollbar(s) on all elements matching the current selector, now and in the future.
+        * Set live: true when you need to add scrollbar(s) on elements that do not yet exist in the page. 
+        * These could be elements added by other scripts or plugins after some action by the user takes place (e.g. lightbox markup may not exist untill the user clicks a link).
+        * If you need at any time to disable or enable the live option, set live: "off" and "on" respectively.
+        * You can also tell the script to disable live option after the first invocation by setting live: "once".
+        */
+        live?: string|boolean;
+        /**
+        * Set the matching set of elements (instead of the current selector) to add scrollbar(s), now and in the future.
+        */
+        liveSelector?: string;
+
     }
 
     interface ScrollToParameterOptions {
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
index 198f49f7bc..367aae4e11 100644
--- a/material-ui/material-ui.d.ts
+++ b/material-ui/material-ui.d.ts
@@ -641,6 +641,7 @@ declare namespace __MaterialUI {
         touchRippleColor?: string;
         touchRippleOpacity?: number;
         type?: string;
+        containerElement?: React.ReactNode | string;
     }
 
     interface EnhancedButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<EnhancedButton> {
diff --git a/mdns/mdns.d.ts b/mdns/mdns.d.ts
index d159ee7dba..63e1e7b72a 100644
--- a/mdns/mdns.d.ts
+++ b/mdns/mdns.d.ts
@@ -49,6 +49,9 @@ declare namespace MDNS {
     interface Browser extends NodeJS.EventEmitter {
         start():any;
         stop():any;
+        on(event:string, listener:Function):this;
+        on(event:'serviceUp', listener:(info:Service)=>void):this;
+        on(event:'serviceDown', listener:(info:Service)=>void):this;
     }
 
     interface BrowserStatic {
diff --git a/meteor/README.md b/meteor/README.md
index d9d7898ffb..7c8aa5cb1d 100644
--- a/meteor/README.md
+++ b/meteor/README.md
@@ -1,4 +1,13 @@
-# Meteor Type Definitions
+# Meteor Type Definitions [DEPRECATED]
+
+## Deprecated
+
+These definitions for Meteor are now deprecated.  They should still work for versions of Meteor up to 1.2.1.
+
+The canonical TypeScript definitions for Meteor can now be found using the NPM [Typings definition manager](https://www.npmjs.com/package/typings).  If you prefer to view the definitions directly, or contribute to them, they can be found here: <https://github.com/meteor-typings/meteor>.
+
+
+## Description
 
 These are the definitions for version 1.3 of Meteor.  These definitions were generated from the from the same [Meteor data.js file] (https://github.com/meteor/meteor/blob/devel/docs/client/data.js) that is used to generate the official [Meteor docs] (http://docs.meteor.com/).  The code that generates these definitions can be found [here](https://github.com/meteor-typescript/meteor-typescript-libs/).
 
diff --git a/meteor/meteor-tests.ts b/meteor/meteor-tests.ts
index bc877bdea0..4b5a154794 100644
--- a/meteor/meteor-tests.ts
+++ b/meteor/meteor-tests.ts
@@ -650,16 +650,16 @@ Accounts.emailTemplates.siteName = "AwesomeSite";
 Accounts.emailTemplates.from = "AwesomeSite Admin <accounts@example.com>";
 Accounts.emailTemplates.headers = { asdf: 'asdf', qwer: 'qwer' };
 
-Accounts.emailTemplates.enrollAccount.subject = function (user) {
+Accounts.emailTemplates.enrollAccount.subject = function (user: Meteor.User) {
   return "Welcome to Awesome Town, " + user.profile.name;
 };
-Accounts.emailTemplates.enrollAccount.html = function (user, url) {
+Accounts.emailTemplates.enrollAccount.html = function (user: Meteor.User, url: string) {
   return "<h1>Some html here</h1>";
 };
 Accounts.emailTemplates.enrollAccount.from = function() {
   return "asdf@asdf.com";
 };
-Accounts.emailTemplates.enrollAccount.text = function (user, url) {
+Accounts.emailTemplates.enrollAccount.text = function (user: Meteor.User, url: string) {
   return "You have been selected to participate in building a better future!"
         + " To activate your account, simply click the link below:\n\n"
         + url;
diff --git a/mocha/mocha-tests.ts b/mocha/mocha-tests.ts
index d0108263ec..c6185aa32b 100644
--- a/mocha/mocha-tests.ts
+++ b/mocha/mocha-tests.ts
@@ -66,6 +66,21 @@ function test_test() {
     });
 }
 
+function test_specify() {
+
+    specify('does something', () => { });
+
+    specify('does something', (done) => { done(); });
+
+    specify.only('does something', () => { });
+
+    specify.skip('does something', () => { });
+
+    specify('does something', function () {
+        this.timeout(2000);
+    });
+}
+
 function test_before() {
     before(() => { });
 
diff --git a/mocha/mocha.d.ts b/mocha/mocha.d.ts
index 56c6cdba82..eb167c83c9 100644
--- a/mocha/mocha.d.ts
+++ b/mocha/mocha.d.ts
@@ -44,6 +44,7 @@ declare var it: Mocha.ITestDefinition;
 declare var xit: Mocha.ITestDefinition;
 // alias for `it`
 declare var test: Mocha.ITestDefinition;
+declare var specify: Mocha.ITestDefinition;
 
 declare function before(action: () => void): void;
 
diff --git a/node/node.d.ts b/node/node.d.ts
index bffb007c4b..8fbed6bc51 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -1399,6 +1399,7 @@ declare module "fs" {
 
     export interface ReadStream extends stream.Readable {
         close(): void;
+        destroy(): void;
     }
     export interface WriteStream extends stream.Writable {
         close(): void;
diff --git a/nw.js/nw.js-tests.ts b/nw.js/nw.js-tests.ts
new file mode 100644
index 0000000000..585b7ebe3c
--- /dev/null
+++ b/nw.js/nw.js-tests.ts
@@ -0,0 +1,352 @@
+/// <reference path="nw.js.d.ts" />
+/*
+ * nw.App Tests
+ */
+var argv = nw.App.argv;
+var fullArgv = nw.App.fullArgv;
+var filteredArgv = nw.App.filteredArgv;
+var dataPath = nw.App.dataPath;
+var manifest = nw.App.manifest;
+
+nw.App.clearCache();
+nw.App.closeAllWindows();
+nw.App.crashBrowser();
+nw.App.crashRenderer();
+nw.App.getProxyForURL( 'https://github.com/alirdn' );
+nw.App.setProxyConfig( 'http=foopy:80;ftp=foopy2' );
+nw.App.quit();
+nw.App.addOriginAccessWhitelistEntry( 'http://github.com/', 'chrome-extension', location.host, true );
+nw.App.removeOriginAccessWhitelistEntry( 'http://github.com/', 'chrome-extension', location.host, true );
+
+/*
+ * Note:
+ * nw.App.registerGlobalHotKey() tested in Shortcut Tests
+ * nw.App.unregisterGlobalHotKey() tested in Shortcut Tests
+ * */
+
+nw.App.on( 'open', function ( args ) {
+    console.log( args );
+});
+
+nw.App.on( 'reopen', function () {
+    console.log( 'reopened' );
+});
+
+/**
+ * nw.Clipboard Tests
+ */
+// get the system clipboard
+var clipboard = nw.Clipboard.get();
+// Read from clipboard
+var text = clipboard.get( 'text' );
+console.log( text );
+
+// Or write something
+clipboard.set( 'I love NW.js :)', 'text' );
+
+// And clear it!
+clipboard.clear();
+
+/**
+ * nw.Menu Tests
+ */
+// Create an empty context menu
+var menu = new nw.Menu();
+
+// Add some items
+menu.append( new nw.MenuItem( { label: 'Item A' }) );
+menu.append( new nw.MenuItem( { label: 'Item B' }) );
+menu.append( new nw.MenuItem( { type: 'separator' }) );
+menu.append( new nw.MenuItem( { label: 'Item C' }) );
+
+// Remove one item
+menu.removeAt( 1 );
+
+// Popup as context menu
+menu.popup( 10, 10 );
+
+// Iterate menu's items
+for ( var i = 0; i < menu.items.length; ++i ) {
+    console.log( menu.items[i] );
+}
+// Create an empty menubar
+var menu = new nw.Menu( { type: 'menubar' });
+
+// Create a submenu as the 2nd level menu
+var submenu = new nw.Menu();
+submenu.append( new nw.MenuItem( { label: 'Item A' }) );
+submenu.append( new nw.MenuItem( { label: 'Item B' }) );
+
+// Create and append the 1st level menu to the menubar
+menu.append( new nw.MenuItem( {
+    label: 'First Menu',
+    submenu: submenu
+}) );
+
+// Assign it to `window.menu` to get the menu displayed
+nw.Window.get().menu = menu;
+
+/**
+ * nw.MenuItem Tests
+ */
+var item: any;
+
+// Create a separator
+item = new nw.MenuItem( { type: 'separator' });
+
+// Create a normal item with label and icon
+item = new nw.MenuItem( {
+    type: "normal",
+    label: "I'm a menu item",
+    icon: "img/icon.png"
+});
+
+// Or you can omit the 'type' field for normal items
+item = new nw.MenuItem( { label: 'Simple item' });
+
+// Bind a callback to item
+item = new nw.MenuItem( {
+    label: "Click me",
+    click: function () {
+        console.log( "I'm clicked" );
+    },
+    key: "s",
+    modifiers: "ctrl+alt",
+});
+
+// You can have submenu!
+var submenu = new nw.Menu();
+submenu.append( new nw.MenuItem( { label: 'Item 1' }) );
+submenu.append( new nw.MenuItem( { label: 'Item 2' }) );
+submenu.append( new nw.MenuItem( { label: 'Item 3' }) );
+item.submenu = submenu;
+
+// And everything can be changed at runtime
+item.label = 'New label';
+item.click = function () {
+    console.log( 'New click callback' );
+};
+
+/**
+ * nw.Screen Tests
+ */
+//init must be called once during startup, before any function to nw.Screen can be called
+nw.Screen.Init();
+
+var screenCB = {
+    onDisplayBoundsChanged: function ( screen: any ) {
+        console.log( 'displayBoundsChanged', screen );
+    },
+
+    onDisplayAdded: function ( screen: any ) {
+        console.log( 'displayAdded', screen );
+    },
+
+    onDisplayRemoved: function ( screen: any ) {
+        console.log( 'displayRemoved', screen )
+    }
+};
+
+// listen to screen events
+nw.Screen.on( 'displayBoundsChanged', screenCB.onDisplayBoundsChanged );
+nw.Screen.on( 'displayAdded', screenCB.onDisplayAdded );
+nw.Screen.on( 'displayRemoved', screenCB.onDisplayRemoved );
+
+/**
+ * nw.Screen.chooseDesktopMedia() Tests
+ */
+nw.Screen.Init(); // you only need to call this once
+nw.Screen.chooseDesktopMedia( ["window", "screen"],
+    function ( streamId ) {
+        var vid_constraint = {
+            mandatory: {
+                chromeMediaSource: 'desktop',
+                chromeMediaSourceId: streamId,
+                maxWidth: 1920,
+                maxHeight: 1080
+            },
+            optional: <any[]>[]
+        };
+        //navigator.webkitGetUserMedia( { audio: false, video: constraint }, success_func, fallback_func );
+    }
+);
+
+/**
+ * nw.Screen.DesktopCaptureMonitor Tests
+ */
+var dcm = nw.Screen.DesktopCaptureMonitor;
+nw.Screen.Init();
+dcm.on( "added", function ( id, name, order, type ) {
+    //select first stream and shutdown
+    var constraints = {
+        audio: {
+            mandatory: {
+                chromeMediaSource: "system",
+                chromeMediaSourceId: dcm.registerStream( id )
+            }
+        },
+        video: {
+            mandatory: {
+                chromeMediaSource: 'desktop',
+                chromeMediaSourceId: dcm.registerStream( id )
+            }
+        }
+    };
+
+    // TODO: call getUserMedia with contraints
+
+    dcm.stop();
+});
+
+dcm.on( "removed", function ( id ) {
+});
+dcm.on( "orderchanged", function ( id, new_order, old_order ) {
+});
+dcm.on( "namechanged", function ( id, name ) {
+});
+dcm.on( "thumbnailchanged", function ( id, thumbnail ) {
+});
+dcm.start( true, true );
+
+/**
+ * nw.Shell Tests
+ */
+// Open URL with default browser.
+nw.Shell.openExternal( 'https://github.com/nwjs/nw.js' );
+
+// Open a text file with default text editor.
+nw.Shell.openItem( 'test.txt' );
+
+// Show a file in parent folder with file manager.
+nw.Shell.showItemInFolder( 'test.txt' );
+
+/**
+ * nw.Shortcut Tests
+ */
+var option = {
+    key: "Ctrl+Shift+A",
+    active: function () {
+        console.log( "Global desktop keyboard shortcut: " + this.key + " active." );
+    },
+    failed: function ( msg: any ) {
+        // :(, fail to register the |key| or couldn't parse the |key|.
+        console.log( msg );
+    }
+};
+
+// Create a shortcut with |option|.
+var shortcut = new nw.Shortcut( option );
+
+// Register global desktop shortcut, which can work without focus.
+nw.App.registerGlobalHotKey( shortcut );
+
+// If register |shortcut| successfully and user struck "Ctrl+Shift+A", |shortcut|
+// will get an "active" event.
+
+// You can also add listener to shortcut's active and failed event.
+shortcut.on( 'active', function () {
+    console.log( "Global desktop keyboard shortcut: " + this.key + " active." );
+});
+
+shortcut.on( 'failed', function ( msg: any ) {
+    console.log( msg );
+});
+
+// Unregister the global desktop shortcut.
+nw.App.unregisterGlobalHotKey( shortcut );
+
+/**
+ * nw.Tray Tests
+ */
+// Create a tray icon
+var tray = new nw.Tray( { title: 'Tray', icon: 'img/icon.png' });
+
+// Give it a menu
+var menu = new nw.Menu();
+menu.append( new nw.MenuItem( { type: 'checkbox', label: 'box1' }) );
+tray.menu = menu;
+
+// Remove the tray
+tray.remove();
+tray = null;
+
+/**
+ * nw.Window Tests
+ */
+// Get the current window
+var win = nw.Window.get();
+
+// Listen to the minimize event
+win.on( 'minimize', function () {
+    console.log( 'Window is minimized' );
+});
+
+// Minimize the window
+win.minimize();
+
+// Unlisten the minimize event
+win.removeAllListeners( 'minimize' );
+
+// Create a new window and get it
+nw.Window.open( 'https://github.com', {}, function ( new_win ) {
+    // And listen to new window's focus event
+    new_win.on( 'focus', function () {
+        console.log( 'New window is focused' );
+    });
+});
+
+// Get the current window
+var win = nw.Window.get();
+
+// Create a new window and get it
+nw.Window.open( 'https://github.com/nwjs/nw.js', {}, function ( new_win ) {
+    // do something with the newly created window
+});
+
+win.on( 'close', function () {
+    this.hide(); // Pretend to be closed already
+    console.log( "We're closing..." );
+    this.close( true ); // then close it forcely
+});
+
+win.close();
+
+// png as base64string
+win.capturePage( function ( base64string ) {
+    // do something with the base64string
+}, { format: 'png', datatype: 'raw' });
+
+// png as node buffer
+win.capturePage( function ( buffer ) {
+    // do something with the buffer
+}, { format: 'png', datatype: 'buffer' });
+
+// Open a new window.
+nw.Window.open( 'popup.html', {}, function ( win ) {
+
+    // Release the 'win' object here after the new window is closed.
+    win.on( 'closed', function () {
+        win = null;
+    });
+
+    // Listen to main window's close event
+    nw.Window.get().on( 'close', function () {
+        // Hide the window to give user the feeling of closing immediately
+        this.hide();
+
+        // If the new window is still open then close it.
+        if ( win != null )
+            win.close( true );
+
+        // After closing the new window, close the main window.
+        this.close( true );
+    });
+
+});
+
+nw.Window.get().on( 'new-win-policy', function ( frame, url, policy ) {
+    // do not open the window
+    policy.ignore();
+    // and open it in external browser
+    nw.Shell.openExternal( url );
+});
diff --git a/nw.js/nw.js.d.ts b/nw.js/nw.js.d.ts
new file mode 100644
index 0000000000..6ae2582e50
--- /dev/null
+++ b/nw.js/nw.js.d.ts
@@ -0,0 +1,1883 @@
+// Type definitions for nw.js v0.13.x and later
+// Project: http://nwjs.io
+// Definitions by: Alireza Dabiri Nejad <https://github.com/alirdn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+/**
+ * Helpers class and interfaces defined here, to make `nw` module cleaner.
+ */
+declare module NWJS_Helpers {
+
+    /**
+     * Node.js v6.x EventEmitter Class
+     */
+    class EventEmitter implements NodeJS.EventEmitter {
+        static EventEmitter: EventEmitter;
+
+        static listenerCount( emitter: EventEmitter, event: string ): number; // deprecated
+        static defaultMaxListeners: number;
+
+        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;
+
+        setMaxListeners( n: number ): this;
+
+        getMaxListeners(): number;
+
+        listeners( event: string ): Function[];
+
+        emit( event: string, ...args: any[] ): boolean;
+
+        listenerCount( type: string ): number;
+    }
+
+    /**
+     * The clipboard object.
+     */
+    interface clip {
+
+        /**
+         * Write `data` of `type` to the clipboard.
+         *
+         * @param data {string} the data to write to the clipboard
+         * @param type {string} (Optional) the type of the data. Support text, png, jpeg, html and rtf. By default, type is set to "text".
+         * @param raw {boolean} (Optional) requiring raw image data. This option is only valid if type is png or jpeg. By default, raw is set to false.
+         */
+        set( data: string, type?: string, raw?: boolean ): void;
+
+        /**
+         * Get the data of `type` from clipboard.
+         *
+         * @param type {string} (Optional) the type of the data. Support text, png, jpeg, html and rtf. By default, type is set to "text".
+         * @param raw {boolean} (Optional) requiring raw image data. This option is only valid if type is png or jpeg.
+         * @returns {string} the data retrieved from the clipboard.
+         */
+        get( type?: string, raw?: boolean ): string;
+
+        /**
+         * Get an array contains list of available types of data in clipboard currenly.
+         * You can use the returned list as a suggestion to get the right data from clipboard.
+         *
+         * @returns {string[]} List of available types of data in clipboard currenly.
+         */
+        readAvailableTypes(): string[];
+
+        /**
+         * Clear the clipboard.
+         */
+        clear(): void;
+    }
+
+    /**
+     * Object that contains options to use while creation of nw.Menu. example: new nw.Menu(MenuOption)
+     */
+    interface MenuOption {
+        /**
+         * {string} (Optional) two types are accepted by this method: "menubar" or "contextmenu". The value is set to "contextmenu" by default.
+         */
+        type: string;
+    }
+
+    /**
+     * Options to modify default `edit` and `window` MenuItems in Mac.
+     */
+    interface CreateMacBuiltinOption {
+
+        /**
+         * {Boolean} (Optional) do not populate the Edit menu
+         */
+        hideEdit?: boolean;
+
+        /**
+         * {Boolean} (Optional) do not populate the Window menu
+         */
+        hideWindow?: boolean;
+    }
+
+    /**
+     * Options for MenuItem.
+     */
+    interface MenuItemOption {
+
+        /**
+         * {string} (Optional) Label for normal item or checkbox
+         */
+        label?: string;
+
+        /**
+         * {string} (Optional) Icon for normal item or checkbox
+         */
+        icon?: string;
+
+        /**
+         * {string} (Optional) Tooltip for normal item or checkbox
+         */
+        tooltip?: string;
+
+        /**
+         * {string} (Optional) The type of the item. Three types are accepted: normal, checkbox, separator
+         */
+        type?: string | "normal" | "checkbox" | "separator";
+
+        /**
+         * {Function} (Optional) The callback function when item is triggered by mouse click or keyboard shortcut
+         */
+        click?: Function;
+
+        /**
+         * {boolean} (Optional) Whether the item is enabled or disabled. It"s set to true by default.
+         */
+        enabled?: boolean;
+
+        /**
+         * {boolean} (Optional) Whether the checkbox is checked or not. It"s set to false by default.
+         */
+        checked?: boolean;
+
+        /**
+         * {nw.Menu} (Optional) A submenu
+         */
+        submenu?: nw.Menu;
+
+        /**
+         * {string} (Optional) The key of the shortcut
+         */
+        key?: string;
+
+        /**
+         * {string} (Optional) The modifiers of the shortcut
+         */
+        modifiers?: string;
+    }
+
+    /**
+     * nw.Screen screen object
+     */
+    interface screen {
+
+        /**
+         * Unique id for a screen
+         */
+        id: number,
+
+        /**
+         * Physical screen resolution, can be negative, not necessarily start from 0,depending on screen arrangement
+         */
+        bounds: {
+            x: number,
+            y: number,
+            width: number,
+            height: number
+        },
+
+        /**
+         * Useable area within the screen bound
+         */
+        work_area: {
+            x: number,
+            y: number,
+            width: number,
+            height: number
+        },
+
+        scaleFactor: number,
+
+        isBuiltIn: boolean,
+
+        rotation: number,
+
+        touchSupport: number
+    }
+
+    /**
+     * This API behaves similar functions as Screen.chooseDesktopMedia. But it doesn"t have GUI.
+     */
+    interface DesktopCaptureMonitor extends EventEmitter {
+
+        /**
+         * Boolean of whether the DesktopCaptureMonitor is started.
+         */
+        started: boolean;
+
+        /**
+         * The DesktopCaptureMonitor will start monitoring the system and trigger the the events.
+         *
+         * @param should_include_screens {boolean} Whether should include screens
+         * @param should_include_windows {boolean} Whether should include windows
+         */
+        start( should_include_screens: boolean, should_include_windows: boolean ): void;
+
+        /**
+         * The DesktopCaptureMonitor will stop monitoring the system.
+         */
+        stop(): void;
+
+        /**
+         * Register and return a valid stream id passed into chromeMediaSourceId in getUserMedia constraints.
+         *
+         * @param id {string} valid stream id.
+         */
+        registerStream( id: string ): void;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * Emit when a new source was added.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(id?,name?,order?,type?,primary?)} The callback that handles the `added` event.
+         * - (optional) id {string} Is the media id.
+         * - (optional) name {string} Is the title of the window or screen.
+         * - (optional) order {number} Is the z-order of the windows, if screens are selected they will appear first.
+         * - (optional) type {string} Type of the stream: "screen", "window", "other" or "unknown".
+         * - (optional) primary {boolean} This will be true if the source is the primary monitor. (Windows OS only)
+         */
+        on( event: 'added', listener: ( id?: string, name?: string, order?: number, type?: string, primary?: boolean ) => any ): this;
+
+        /**
+         * Emit when a source was removed.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(order?)} The callback that handles the `remove` event.
+         * - (optional) order {number} Is the order of the media source that is no longer capturable.
+         */
+        on( event: 'removed', listener: ( order?: number ) => any ): this;
+
+        /**
+         * Emit when the Z-order of a source changed (this may change for windows as others are focused).
+         *
+         * @param event {string} Event name
+         * @param listener {Function(id?,new_order?,old_order?)} The callback that handles the `orderchanged` event.
+         * - (optional) id {string} Is the media id of the screen or window that has changed z-order.
+         * - (optional) new_order {number} Is the new z-order.
+         * - (optional) old_order {number} Is the old z-order.
+         */
+        on( event: 'orderchanged', listener: ( id?: string, new_order?: number, old_order?: number ) => any ): this;
+
+        /**
+         * Emit when the name of the source has changed. This can happen when a window changes title.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(id?,new_order?,old_order?)} The callback that handles the `namechanged ` event.
+         * - (optional) id {string} Is the media id of the screen or window that has a name changed.
+         * - (optional) name {string} Is the new name of the screen or window.
+         */
+        on( event: 'namechanged', listener: ( id?: string, name?: string ) => any ): this;
+
+        /**
+         * Emit when the thumbnail of a source changed.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(id?,new_order?,old_order?)} The callback that handles the `thumbnailchanged ` event.
+         * - (optional) id {string} Is the media id of the screen or window that has an updated thumbnail.
+         * - (optional) name {string} Is the base64 encoded png of the thumbnail.
+         */
+        on( event: 'thumbnailchanged', listener: ( id?: string, thumbnail?: string ) => any ): this;
+    }
+
+    /**
+     * Shortcut option is an object contains initial settings for the Shortcut.
+     */
+    interface ShortcutOption {
+
+        /**
+         * {Function} (Optional) A callback when the hotkey is triggered.
+         */
+        active: Function;
+
+        /**
+         * {Function} (Optional) A callback when failed to register the hotkey.
+         *
+         * @param msg {string} Failure message
+         */
+        failed: ( msg?: string ) => any;
+
+        /**
+         * {string} Key combinations of the shortcut, such as "ctrl+shift+a".
+         */
+        key: string;
+    }
+
+    /**
+     *  Option for tray that contains initial settings for the Tray.
+     */
+    interface TrayOption {
+
+        /**
+         * {string} title
+         */
+        title?: string;
+
+        /**
+         * {string} tooltip
+         */
+        tooltip?: string;
+
+        /**
+         * {string} icon
+         */
+        icon?: string;
+
+        /**
+         * {string} alternate
+         */
+        alticon?: string;
+
+        /**
+         * {boolean} whether icons are templates
+         */
+        iconsAreTemplates?: boolean;
+
+        /**
+         * {Menu} popup menu
+         */
+        menu?: nw.Menu;
+    }
+
+    /**
+     * Options for nw.Window.get().print().
+     */
+    interface PrintOption {
+
+        /**
+         * The device name of the printer
+         */
+        printer: string;
+
+        /**
+         * The path of the output PDF when printing to PDF
+         */
+        pdf_path: string;
+
+        /**
+         * Whether to enable header and footer
+         */
+        headerFooterEnabled: boolean;
+
+        /**
+         * Whether to use landscape or portrait
+         */
+        landscape: boolean;
+
+        /**
+         * The paper size spec
+         * example: 'mediaSize':{'name': 'CUSTOM', 'width_microns': 279400, 'height_microns': 215900, 'custom_display_name':'Letter', 'is_default': true}
+         */
+        mediaSize: JSON;
+
+        /**
+         * Whether to print CSS backgrounds
+         */
+        shouldPrintBackgrounds: boolean;
+    }
+
+    /**
+     * Config for nw.Window.get().capturePage().
+     */
+    interface CapturePageConfig {
+
+        /**
+         * (Optional) The image format used to generate the image. It supports two formats: "png" and "jpeg". If ignored, it’s "jpeg" by default.
+         */
+        format?: string
+
+        /**
+         *  (Optional) It supports three types: "raw", "buffer" and "datauri". If ignored, it’s "datauri" by default.
+         */
+        datatype?: string
+    }
+
+    /**
+     * This includes multiple functions to manipulate the cookies.
+     */
+    interface Cookies {
+
+        /**
+         * Retrieves information about a single cookie.
+         *
+         * @param details {Objet} Details to identify the cookie being retrieved.
+         * @param callback {function(cookie?)} The callback when cookie retrieved.
+         * - (Optional) cookie {Cookie} Contains details about the cookie. This parameter is null if no such cookie was found.
+         */
+        get( details: CookiesGetDetails, callback: ( cookie?: Cookie ) => void ): void;
+
+        /**
+         * Retrieves all cookies from a single cookie store that match the given information.
+         *
+         * @param details {Objet} Information to filter the cookies being retrieved.
+         * @param callback {function(cookies?)} The callback when cookies retrieved.
+         * - (Optional) cookies {Cookie[]} All the existing, unexpired cookies that match the given cookie info.
+         */
+        getAll( details: CookiesGetAllDetails, callback: ( cookies?: Cookie[] ) => void ): void;
+
+        /**
+         * Sets a cookie with the given cookie data; may overwrite equivalent cookies if they exist.
+         *
+         * @param details {Objet} Details about the cookie being set.
+         * @param callback {function(cookie?)} The callback when cookie has been set.
+         * - (Optional) cookie {Cookie} Contains details about the cookie that's been set. If setting failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set.
+         */
+        set( details: CookiesSetDetails, callback: ( cookie?: Cookie ) => void ): void;
+
+        /**
+         * Deletes a cookie by name.
+         *
+         * @param details {Objet} Information to identify the cookie to remove.
+         * @param callback {function(cookie?)} The callback when cookie has been set.
+         * - (Optional) details {Objet} Contains details about the cookie that's been removed. If removal failed for any reason, this will be "null", and "chrome.runtime.lastError" will be set.
+         */
+        remove( details: CookiesRemoveDetails, callback: ( details?: CookiesRemovedDetails ) => void ): void;
+
+        /**
+         * Fired when a cookie is set or removed.
+         */
+        onChanged: {
+            /**
+             * Add a new listener for onChanged event.
+             *
+             * @param callback {function(changeInfo?)} The callback when cookie has been changed.
+             * - (Optional) changeInfo {Objet} Contains details about the cookie that's been changed.
+             */
+            addListener( callback: ( changeInfo: CookiesOnChangedCallbackChangeInfo ) => void ): void;
+        }
+    }
+
+    /**
+     * Represents information about an HTTP cookie.
+     */
+    interface Cookie {
+
+        /**
+         * The name of the cookie.
+         */
+        name: string;
+
+        /**
+         * The value of the cookie.
+         */
+        value: string;
+
+        /**
+         * The domain of the cookie (e.g. "www.google.com", "example.com").
+         */
+        domain: string;
+
+        /**
+         * True if the cookie is a host-only cookie (i.e. a request's host must exactly match the domain of the cookie).
+         */
+        hostOnly: boolean;
+
+        /**
+         * The path of the cookie.
+         */
+        path: string;
+
+        /**
+         * True if the cookie is marked as Secure (i.e. its scope is limited to secure channels, typically HTTPS).
+         */
+        secure: boolean;
+
+        /**
+         * True if the cookie is marked as HttpOnly (i.e. the cookie is inaccessible to client-side scripts).
+         */
+        httpOnly: boolean;
+
+        /**
+         * The cookie's same-site status (i.e. whether the cookie is sent with cross-site requests).
+         */
+        sameSite: string | "no_restriction" | "lax" | "strict";
+
+        /**
+         * True if the cookie is a session cookie, as opposed to a persistent cookie with an expiration date.
+         */
+        session: boolean;
+
+        /**
+         * (Optional) The expiration date of the cookie as the number of seconds since the UNIX epoch. Not provided for session cookies.
+         */
+        expirationDate?: number;
+
+        /**
+         * The ID of the cookie store containing this cookie.
+         */
+        storeId: string;
+    }
+
+    /**
+     * Coockies.get() details argument object
+     */
+    interface CookiesGetDetails {
+
+        /**
+         * The URL with which the cookie to retrieve is associated.
+         */
+        url: string;
+
+        /**
+         * The name of the cookie to retrieve.
+         */
+        name: string;
+
+        /**
+         * The ID of the cookie store in which to look for the cookie.
+         */
+        storeId: string;
+    }
+
+    /**
+     * Coockies.getAll() details argument object
+     */
+    interface CookiesGetAllDetails {
+
+        /**
+         * Restricts the retrieved cookies to those that would match the given URL.
+         */
+        url?: string;
+
+        /**
+         * Filters the cookies by name.
+         */
+        name?: string;
+
+        /**
+         * Restricts the retrieved cookies to those whose domains match or are subdomains of this one.
+         */
+        domain?: string;
+
+        /**
+         * Restricts the retrieved cookies to those whose path exactly matches this string.
+         */
+        path?: string;
+
+        /**
+         * Filters the cookies by their Secure property.
+         */
+        secure?: boolean;
+
+        /**
+         * Filters out session vs. persistent cookies.
+         */
+        session: boolean;
+
+        /**
+         * The cookie store to retrieve cookies from. If omitted, the current execution context's cookie store will be used.
+         */
+        storeId?: string;
+    }
+
+    /**
+     * Coockies.set() details argument object
+     */
+    interface CookiesSetDetails {
+
+        /**
+         * The request-URI to associate with the setting of the cookie.
+         */
+        url: string;
+
+        /**
+         * The name of the cookie. Empty by default if omitted.
+         */
+        name?: string;
+
+        /**
+         * The value of the cookie. Empty by default if omitted.
+         */
+        value?: string;
+
+        /**
+         * The domain of the cookie. If omitted, the cookie becomes a host-only cookie.
+         */
+        domain?: string;
+
+        /**
+         * The path of the cookie. Defaults to the path portion of the url parameter.
+         */
+        path?: string;
+
+        /**
+         * Whether the cookie should be marked as Secure. Defaults to false.
+         */
+        secure?: boolean;
+
+        /**
+         * Whether the cookie should be marked as HttpOnly. Defaults to false.
+         */
+        httpOnly?: boolean;
+
+        /**
+         * The cookie's same-site status: defaults to 'no_restriction'.
+         */
+        sameSite?: string | "no_restriction" | "lax" | "strict";
+
+        /**
+         * The expiration date of the cookie as the number of seconds since the UNIX epoch. If omitted, the cookie becomes a session cookie.
+         */
+        expirationDate?: number;
+
+        /**
+         * The ID of the cookie store in which to set the cookie. By default, the cookie is set in the current execution context's cookie store.
+         */
+        storeId?: string;
+    }
+
+    /**
+     * Coockies.remove() details argument object
+     */
+    interface CookiesRemoveDetails {
+
+        /**
+         * The URL associated with the cookie.
+         */
+        url: string;
+
+        /**
+         * The name of the cookie to remove.
+         */
+        name: string;
+
+        /**
+         * The ID of the cookie store to look in for the cookie.
+         */
+        storeId: string;
+    }
+
+    /**
+     * Coockies.remove() callback details argument object
+     */
+    interface CookiesRemovedDetails {
+
+        /**
+         * The URL associated with the cookie that's been removed.
+         */
+        url: string;
+
+        /**
+         * The name of the cookie that's been removed.
+         */
+        name: string;
+
+        /**
+         * The ID of the cookie store from which the cookie was removed.
+         */
+        storeId: string;
+    }
+
+    /**
+     * Coockies.onChanged.addListener() callback details argument object
+     */
+    interface CookiesOnChangedCallbackChangeInfo {
+
+        /**
+         * True if a cookie was removed.
+         */
+        removed: boolean;
+
+        /**
+         * Information about the cookie that was set or removed.
+         */
+        cookie: Cookie;
+
+        /**
+         * The underlying reason behind the cookie's change.
+         */
+        cause: string | "evicted" | "expired" | "explicit" | "expired_overwrite" | "overwrite"
+    }
+
+    /**
+     * nw.Window.get().on('new-win-policy') callback policy argument object
+     */
+    interface WinPolicy {
+
+        /**
+         * Ignore the request, navigation won’t happen.
+         */
+        ignore(): void;
+
+        /**
+         * Force the link to be opened in the same frame
+         */
+        forceCurrent(): void;
+
+        /**
+         * Force the link to be a downloadable, or open by external program
+         */
+        forceDownload(): void;
+
+        /**
+         * Force the link to be opened in a new window
+         */
+        forceNewWindow(): void;
+
+        /**
+         * Force the link to be opened in a new popup window
+         */
+        forceNewPopup(): void;
+
+        /**
+         * Control the options for the new popup window.
+         *
+         *@param m {Object} The object is in the same format as the Window subfields in manifest format.
+         */
+        setNewWindowManifest( m: WindowOption ): void;
+    }
+
+    /**
+     * nw.Window Option that is in the same format as the Window subfields in manifest format.
+     */
+    interface WindowOption {
+
+        /**
+         * The id used to identify the window.
+         */
+        id?: string;
+
+        /**
+         * The default title of window created by NW.js
+         */
+        title?: string;
+
+        /**
+         * The initial width of the main window.
+         */
+        width?: number;
+
+        /**
+         * The initial height of the main window.
+         */
+        height?: number;
+
+        /**
+         * Path to window’s icon
+         */
+        icon?: string;
+
+        /**
+         * Controls where window will be put, be `null` or `center` or `mouse`
+         */
+        position?: string;
+
+        /**
+         * Minimum width of window
+         */
+        min_width?: number;
+
+        /**
+         * Minimum height of window
+         */
+        min_height?: number;
+
+        /**
+         * Maximum width of window
+         */
+        max_width?: number;
+
+        /**
+         * Maximum height of window
+         */
+        max_height?: number;
+
+        /**
+         * Show as desktop background window under X11 environment
+         */
+        as_desktop?: boolean;
+
+        /**
+         * Whether window is resizable
+         */
+        resizable?: boolean;
+
+        /**
+         * Whether the window should always stay on top of other windows.
+         */
+        always_on_top?: boolean;
+
+        /**
+         * Whether the window should be visible on all workspaces simultaneously (on platforms that support multiple workspaces, currently Mac OS X and Linux).
+         */
+        visible_on_all_workspaces?: boolean;
+
+        /**
+         * Whether window is fullscreen
+         */
+        fullscreen?: boolean;
+
+        /**
+         * Whether the window is shown in taskbar or dock. The default is true.
+         */
+        show_in_taskbar?: boolean;
+
+        /**
+         * Specify it to false to make the window frameless
+         */
+        frame?: boolean;
+
+        /**
+         * Specify it to false if you want your app to be hidden on startup
+         */
+        show?: boolean;
+
+        /**
+         * Whether to use Kiosk mode.
+         */
+        kiosk?: boolean;
+
+        /**
+         * Whether to turn on transparent window mode.
+         */
+        transparent?: boolean;
+    }
+
+    interface WindowOpenOption extends WindowOption {
+
+        /**
+         * (Optional) Whether to open a new window in a separate render process.
+         */
+        new_instance?: boolean;
+
+        /**
+         * (Optional) The script to be injected before document loaded.
+         */
+        inject_js_start?: string;
+
+        /**
+         * (Optional) The script to be injected before document unloaded.
+         */
+        inject_js_end?: string;
+
+        /**
+         * (Optional) The id used to identify the window.
+         */
+        id?: string;
+    }
+
+    /**
+     * nw.Window.get().on('navigation') callback policy argument object
+     */
+    interface WinNavigationPolicy {
+
+        /**
+         * Ignore the request, navigation won’t happen.
+         */
+        ignore(): void;
+    }
+
+    interface win extends EventEmitter {
+
+        /**
+         * Get the corresponding DOM window object of the native window.
+         */
+        window: Object;
+
+        /**
+         * Get or set left offset from window to screen.
+         */
+        x: number;
+
+        /**
+         * Get or set top offset from window to screen.
+         */
+        y: number;
+
+        /**
+         * Get or set window's width.
+         */
+        width: number;
+
+        /**
+         * Get or set window's height.
+         */
+        height: number;
+
+        /**
+         * Get or set window's title.
+         */
+        title: string;
+
+        /**
+         * Get or set window's menubar.
+         */
+        menu: nw.Menu;
+
+        /**
+         * Get whether we're in fullscreen mode.
+         */
+        isFullscreen: boolean;
+
+        /**
+         * Get whether transparency is turned on
+         */
+        isTransparent: boolean;
+
+        /**
+         * Get whether we're in kiosk mode.
+         */
+        isKioskMode: boolean;
+
+        /**
+         * Get or set the page zoom.
+         */
+        zoomLevel: number;
+
+        /**
+         * This includes multiple functions to manipulate the cookies.
+         */
+        cookies: Cookies;
+
+        /**
+         * Moves a window's left and top edge to the specified coordinates.
+         *
+         * @param x {Integer} Offset to the left of the screen
+         * @param y {Integer} Offset to the top of the screen
+         */
+        moveTo( x: number, y: number ): void;
+
+        /**
+         * Moves a window a specified number of pixels relative to its current coordinates.
+         *
+         * @param x {Integer} Horizontal offset
+         * @param y {Integer} Vertical offset
+         */
+        moveBy( x: number, y: number ): void;
+
+        /**
+         * Resizes a window to the specified width and height.
+         *
+         * @param width {Integer} The width of the window
+         * @param height {Integer} The height of the window
+         */
+        resizeTo( width: number, height: number ): void;
+
+        /**
+         * Resizes a window by the specified amount.
+         *
+         * @param width {Integer} The offset width of the window
+         * @param height {Integer} The offset height of the window
+         */
+        resizeBy( width: number, height: number ): void;
+
+        /**
+         * Focus on the window.
+         */
+        focus(): void;
+
+        /**
+         * Move focus away.
+         */
+        blur(): void;
+
+        /**
+         * Show the window if it's not shown.
+         *
+         * @param is_show {boolean} (Optional) Specify whether the window should be shown or hidden. It's set to true by default.
+         */
+        show( is_show?: boolean ): void;
+
+        /**
+         * Hide the window.
+         */
+        hide(): void;
+
+        /**
+         * Close current window.
+         *
+         * @param force {boolean} (Optional) Specify whether to close the window forcely and bypass close event.
+         */
+        close( force?: boolean ): void;
+
+        /**
+         * Reloads the current window.
+         */
+        reload(): void;
+
+        /**
+         * Reloads the current page by starting a new renderer process from scratch.
+         */
+        reloadDev(): void;
+
+        /**
+         * Like reload(), but don't use caches (aka 'shift-reload').
+         */
+        reloadIgnoringCache(): void;
+
+        /**
+         * Maximize the window on GTK and Windows, and zoom the window on Mac OS X.
+         */
+        maximize(): void;
+
+        /**
+         * Minimize the window to task bar on Windows, iconify the window on GTK, and miniaturize the window on Mac OS X.
+         */
+        minimize(): void;
+
+        /**
+         * Restore window to previous state after the window is minimized.
+         */
+        restore(): void;
+
+        /**
+         * Make the window fullscreen.
+         */
+        enterFullscreen(): void;
+
+        /**
+         * Leave the fullscreen mode.
+         */
+        leaveFullscreen(): void;
+
+        /**
+         * Toggle the fullscreen mode.
+         */
+        toggleFullscreen(): void;
+
+        /**
+         * Enter the Kiosk mode.
+         */
+        enterKioskMode(): void;
+
+        /**
+         * Leave the Kiosk mode.
+         */
+        leaveKioskMode(): void;
+
+        /**
+         * Toggle the kiosk mode.
+         */
+        toggleKioskMode(): void;
+
+        /**
+         * Open the devtools to inspect the window.
+         *
+         * @param iframe {Integer} (Optional) the id or the element of the <iframe> to be jailed on. By default, the DevTools is shown for entire window.
+         * @param callback {function(dev_win?)} callback with the native window of the DevTools window.
+         * - (optional) dev_win {window} Window object that you can use any properties and methods of Window except the events
+         */
+        showDevTools( iframe?: string | HTMLIFrameElement, callback?: ( dev_win?: Window ) => void ): void;
+
+        /**
+         * Close the devtools window.
+         */
+        closeDevTools(): void;
+
+        /**
+         * Enumerate the printers in the system.
+         *
+         * @param callback {function(dev_win?)} callback with the native window of the DevTools window.
+         * - (optional) printers {JSON[]} An array of JSON objects for the printer information.
+         */
+        getPrinters( callback: ( printers?: JSON[] ) => void ): void;
+
+        /**
+         * Query the status of devtools window.
+         */
+        isDevToolsOpen(): boolean;
+
+        /**
+         * Print the web contents in the window without the need for user’s interaction.
+         *
+         * @param options {Object} Specify whether to close the window forcely and bypass close event.
+         */
+        print( options: JSON | PrintOption ): void;
+
+        /**
+         * Set window's maximum size.
+         *
+         * @param width {Integer} The maximum width of the window
+         * @param height {Integer} The maximum height of the window
+         */
+        setMaximumSize( width: number, height: number ): void;
+
+        /**
+         * Set window's minimum size.
+         *
+         * @param width {Integer} The minimum width of the window
+         * @param height {Integer} The minimum height of the window
+         */
+        setMinimumSize( width: number, height: number ): void;
+
+        /**
+         * Set whether window is resizable.
+         *
+         * @param resizable {boolean} Whether the window can be resized
+         */
+        setResizable( resizable: boolean ): void;
+
+        /**
+         * Sets the widget to be on top of all other windows in the window system.
+         *
+         * @param top {boolean} Whether the window should always be on top
+         */
+        setAlwaysOnTop( top: boolean ): void;
+
+        /**
+         * For platforms that support multiple workspaces (currently Mac OS X and Linux), this allows NW.js windows to be visible on all workspaces simultaneously.
+         *
+         * @param visible {boolean} Whether the window should be visible on all workspaces
+         */
+        setVisibleOnAllWorkspaces( visible: boolean ): void;
+
+        /**
+         * Returns a a boolean indicating if the platform (currently Mac OS X and Linux) support Window API method setVisibleOnAllWorkspace(Boolean).
+         */
+        canSetVisibleOnAllWorkspaces(): boolean;
+
+        /**
+         * Move window to specified position.
+         *
+         * @param position {string} The position of the window. There are three valid positions: null or center or mouse
+         */
+        setPosition( position: string ): void;
+
+        /**
+         * Control whether to show window in taskbar or dock.
+         *
+         * @param show {boolean} Whether show in task bar
+         */
+        setShowInTaskbar( show: boolean ): void;
+
+        /**
+         * Request the user’s attension by making the window flashes in the task bar.
+         *
+         * @param attension {boolean | number} If a Boolean, it indicates to request or cancel user’s attension. If an Integer, it indicates the number of times the window flashes.
+         */
+        requestAttention( attension: boolean | number ): void;
+
+        /**
+         * Captures the visible area of the window.
+         *
+         * @param callback {string} The callback when finished capturing the window
+         * - (optional) arg {base64string|Buffer} Captured page data.
+         * @param config {string|CapturePageConfig} (Optional) Conig how captured page returned.
+         */
+        capturePage( callback: ( arg: string | Object ) => void, config?: string | CapturePageConfig ): void;
+
+        /**
+         * Show window progress bar.
+         *
+         * @param progress {number} valid values within [0, 1]. Setting to negative value (<0) removes the progress bar.
+         */
+        setProgressBar( progress: number ): void;
+
+        /**
+         * Set the badge label on the window icon in taskbar or dock.
+         *
+         * @param label {string} Badge label.
+         */
+        setBadgeLabel( label: string ): void;
+
+        /**
+         * Execute a piece of JavaScript in the frame.
+         *
+         * @param frame {HTMLIFrameElement} The frame to execute in. If iframe is null, it assumes in current window / frame.
+         * @param script {string} The source code of the script to be executed
+         */
+        eval( frame: HTMLIFrameElement, script: string ): void;
+
+        /**
+         * Load and execute the compiled snapshot in the frame.
+         *
+         * @param frame {HTMLIFrameElement} The frame to execute in. If iframe is null, it assumes in current window / frame.
+         * @param path {string} the path of the snapshot file generated by nwjc
+         */
+        evalNWBin( frame: HTMLIFrameElement, path: string ): void;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * The close event is a special event that will affect the result of the Window.close() function.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `close` event.
+         * - (optional) byCommandQ {string} Whether it’s being closed by ⌘+Q.
+         */
+        on( event: 'close', listener: ( byCommandQ?: string | any ) => any ): this;
+
+        /**
+         * The closed event is emitted after corresponding window is closed.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `closed` event.
+         */
+        on( event: 'closed', listener: () => any ): this;
+
+        /**
+         * Emitted when the window starts to reload, normally you cannot catch this event because usually it’s emitted before you actually setup the callback.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `loading` event.
+         */
+        on( event: 'loading', listener: () => any ): this;
+
+        /**
+         * Emitted when the window is fully loaded, this event behaves the same with window.onload, but doesn’t rely on the DOM.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `loaded` event.
+         */
+        on( event: 'loaded', listener: () => any ): this;
+
+        /**
+         * Emitted when the document object in this window or a child iframe is available, after all files are loaded, but before DOM is constructed or any script is run.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `document-start` event.
+         * - (optional) frame {HTMLIFrameElement|any} Is the iframe object, or null if the event is for the window..
+         */
+        on( event: 'document-start', listener: ( frame: HTMLIFrameElement | any ) => any ): this;
+
+        /**
+         * Emitted when the document object in this window or a child iframe is unloaded, but before the onunload event is emitted.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `document-end` event.
+         * - (optional) frame {HTMLIFrameElement|any} Is the iframe object, or null if the event is for the window..
+         */
+        on( event: 'document-end', listener: ( frame: HTMLIFrameElement | any ) => any ): this;
+
+        /**
+         * Emitted when window gets focus.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `focus` event.
+         */
+        on( event: 'focus', listener: () => any ): this;
+
+        /**
+         * Emitted when window loses focus.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `blur` event.
+         */
+        on( event: 'blur', listener: () => any ): this;
+
+        /**
+         * Emitted when window is minimized.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `minimize` event.
+         */
+        on( event: 'minimize', listener: () => any ): this;
+
+        /**
+         * Emitted when window is restored from minimize, maximize and fullscreen state.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `restore` event.
+         */
+        on( event: 'restore', listener: () => any ): this;
+
+        /**
+         * Emitted when window is maximized.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `maximize` event.
+         */
+        on( event: 'maximize', listener: () => any ): this;
+
+        /**
+         * Emitted after window is moved.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `move` event.
+         * - (optional) x {Integer} The new location of the left corner of the window.
+         * - (optional) y {Integer} The new location of the top corner of the window.
+         */
+        on( event: 'move', listener: ( x?: number, y?: number ) => any ): this;
+
+        /**
+         * Emitted after window is resized.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `resize` event.
+         * - (optional) width {Integer} The new width of the window.
+         * - (optional) height {Integer} The new height of the window.
+         */
+        on( event: 'resize', listener: ( width?: number, height?: number ) => any ): this;
+
+        /**
+         * Emitted when window enters fullscreen state.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `enter-fullscreen` event.
+         */
+        on( event: 'enter-fullscreen', listener: () => any ): this;
+
+        /**
+         * Emitted when window zooming changed.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `zoom` event.
+         * - (optional) zoom {Integer} Indicating the new zoom level
+         */
+        on( event: 'zoom', listener: ( zoom?: number ) => any ): this;
+
+        /**
+         * Emitted after Devtools is closed.
+         *
+         * @param event {string} Event name
+         * @param listener {function} The callback that handles the `devtools-closed` event.
+         */
+        on( event: 'devtools-closed', listener: () => any ): this;
+
+        /**
+         * Emitted when a new window is requested from this window or a child iframe.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `new-win-policy` event.
+         * - (optional) frame {HTMLIFrameElement} Is the object of the child iframe where the request is from, or null if it’s from the top window.
+         * - (optional) url {string} Is the address of the requested link
+         * - (optional) policy {Object} Is an object contain window policy.
+         */
+        on( event: 'new-win-policy', listener: ( frame?: HTMLIFrameElement | any, url?: string, policy?: WinPolicy ) => any ): this;
+
+        /**
+         * Emitted when navigating to another page.
+         *
+         * @param event {string} Event name
+         * @param listener {function(byCommandQ?)} The callback that handles the `navigation` event.
+         * - (optional) frame {HTMLIFrameElement} Is the object of the child iframe where the request is from, or null if it’s from the top window.
+         * - (optional) url {string} Is the address of the requested link
+         * - (optional) policy {Object} Is an object contain window policy.
+         */
+        on( event: 'navigation', listener: ( frame?: HTMLIFrameElement | any, url?: string, policy?: WinNavigationPolicy ) => any ): this;
+    }
+}
+
+declare namespace nw {
+
+    /* Reference: http://docs.nwjs.io/en/latest/References/App/ */
+    /**
+     * Application General Functionality And Properties.
+     */
+    export interface App {
+
+        /**
+         * Get the filtered command line arguments when starting the app.
+         */
+        argv: string[];
+
+        /**
+         * Get all the command line arguments when starting the app.
+         */
+        fullArgv: string[];
+
+        /**
+         * Get a list of patterns of filtered command line arguments used by `App.argv`.
+         */
+        filteredArgv: Object[];
+
+        /**
+         * Get the application's data path in user's directory.
+         */
+        dataPath: string;
+
+        /**
+         * Get the JSON object of the manifest file.
+         */
+        manifest: JSON;
+
+        /**
+         * Clear the HTTP cache in memory and the one on disk. This method call is synchronized.
+         */
+        clearCache(): void;
+
+        /**
+         * Send the `close` event to all windows of current app.
+         */
+        closeAllWindows(): void;
+
+        /**
+         * Crash the browser process to test the Crash dump feature.
+         */
+        crashBrowser(): void;
+
+        /**
+         * Crash the renderer process to test the Crash dump feature.
+         */
+        crashRenderer(): void;
+
+        /**
+         * Query the proxy to be used for loading `url` in DOM.
+         *
+         * @param url {string} the URL to query for proxy
+         * @returns {string} Proxy config that is in the same format used in PAC (e.g. "DIRECT", "PROXY localhost:8080").
+         */
+        getProxyForURL( url: string ): string;
+
+        /**
+         * Set the proxy config which the web engine will be used to request network resources.
+         *
+         * @param config {string} Proxy rules
+         */
+        setProxyConfig( config: string ): void;
+
+        /**
+         * Quit current app.
+         */
+        quit(): void;
+
+        /**
+         * Add an entry to the whitelist used for controlling cross-origin access.
+         *
+         * @param sourceOrigin {string} The source origin. e.g. http://github.com/
+         * @param destinationProtocol {string} The destination protocol where the sourceOrigin can access to. e.g. app
+         * @param destinationHost {string} The destination host where the sourceOrigin can access to. e.g. myapp
+         * @param allowDestinationSubdomains {Boolean} If set to true, the sourceOrigin is allowed to access subdomains of
+         */
+        addOriginAccessWhitelistEntry( sourceOrigin: string,
+            destinationProtocol: string,
+            destinationHost: string,
+            allowDestinationSubdomains: boolean ): void;
+
+        /**
+         * Remove an entry from the whitelist used for controlling cross-origin access.
+         *
+         * @param sourceOrigin {string} The source origin. e.g. http://github.com/
+         * @param destinationProtocol {string} The destination protocol where the sourceOrigin can access to. e.g. app
+         * @param destinationHost {string} The destination host where the sourceOrigin can access to. e.g. myapp
+         * @param allowDestinationSubdomains {Boolean} If set to true, the sourceOrigin is allowed to access subdomains of
+         */
+        removeOriginAccessWhitelistEntry( sourceOrigin: string,
+            destinationProtocol: string,
+            destinationHost: string,
+            allowDestinationSubdomains: boolean ): void;
+
+        /**
+         * Register a global keyboard shortcut (also known as system-wide hot key) to the system.
+         *
+         * @param shortcut {Shortcut} the Shortcut object to register.
+         */
+        registerGlobalHotKey( shortcut: Shortcut ): void;
+
+        /**
+         * Unregisters a global keyboard shortcut.
+         *
+         * @param shortcut {Shortcut} the Shortcut object to register.
+         */
+        unregisterGlobalHotKey( shortcut: Shortcut ): void;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * Emitted when users opened a file with your app.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(args?)} The callback that handles the `open` event.
+         * - (optional) args {string} the full command line of the program.
+         */
+        on( event: 'open', listener: ( args?: string ) => any ): this;
+
+        /**
+         * This event is sent when the user clicks the dock icon for an already running application. This is a Mac specific feature.
+         *
+         * @param event {string} Event name
+         * @param listener {Function} The callback that handles the `reopen` event.
+         */
+        on( event: 'reopen', listener: () => any ): this;
+    }
+
+    /* Clipboard: http://docs.nwjs.io/en/latest/References/Clipboard/ */
+    /**
+     * `Clipboard` is an abstraction of clipboard for Windows, Linux and Mac.
+     */
+    export interface Clipboard {
+        /**
+         * Get the clipboard object.
+         *
+         * @returns {Clipboard} the clipboard object.
+         */
+        get(): NWJS_Helpers.clip;
+    }
+
+    /* Menu: http://docs.nwjs.io/en/latest/References/Menu/ */
+    /**
+     * `Menu` represents a menubar or a context menu.
+     */
+    class Menu {
+        /**
+         * Create a Menu object.
+         *
+         * @param option {Object} (Optional) Option to customize returned menu object.
+         */
+        constructor( option?: NWJS_Helpers.MenuOption );
+
+        /**
+         * Get an array that contains all items of a menu. Each item is an instance of MenuItem.
+         */
+        items: MenuItem[];
+
+        /**
+         * Append `item` to the tail of the menu.
+         *
+         * @param item {MenuItem} the item to be appended to the tail of the menu
+         */
+        append( item: MenuItem ): void;
+
+        /**
+         * Insert the `item` at `i`th position of the menu. The index is started from 0.
+         *
+         * @param item {MenuItem} the item to be inserted into the menu
+         * @param i {Integer} the index in the menu list to insert the the item
+         */
+        insert( item: MenuItem, i: number ): void;
+
+        /**
+         * Remove `item` from the menu.
+         *
+         * @param item {MenuItem} the item to be removed
+         */
+        remove( item: MenuItem ): void;
+
+        /**
+         * Remove the `i`th item form the menu.
+         *
+         * @param i {Integer} the index of the item to be removed from the menu
+         */
+        removeAt( i: number ): void;
+
+        /**
+         * Popup the context menu at the anchor in (`x`, `y`) in current window.
+         *
+         * @param x {Integer} the x position of the anchor
+         * @param y {Integer} the y position of the anchor
+         */
+        popup( x: number, y: number ): void;
+
+        /**
+         * Creates the builtin menus (App, Edit and Window) within the menubar on Mac.
+         *
+         * @param appname {string} The application name
+         * @param options {Object} (Optional) Options to modify default `edit` and `window` MenuItems in Mac
+         */
+        createMacBuiltin( appname: string, options?: NWJS_Helpers.CreateMacBuiltinOption ): void;
+    }
+
+    /* MenuItem: http://docs.nwjs.io/en/latest/References/MenuItem/ */
+    /**
+     * `MenuItem` represents an item in a menu.
+     */
+    class MenuItem extends NWJS_Helpers.EventEmitter {
+
+        /**
+         * Create a new MenuItem.
+         *
+         * @param option {Object} Customize how MenuItem render and behave.
+         */
+        constructor( option: NWJS_Helpers.MenuItemOption );
+
+        /**
+         * Get the `type` of a `MenuItem`
+         */
+        type: string;
+
+        /**
+         * Get or set the `label` of a `MenuItem`
+         */
+        lable: string;
+
+        /**
+         * Get or set the `icon` of a `MenuItem`
+         */
+        icon: string;
+
+        /**
+         * Get or set whether `icon` image is treated as "template" (`true` by default).
+         */
+        iconIsTemplate: boolean;
+
+        /**
+         * Get or set the `tooltip` of a `MenuItem`
+         */
+        tooltip: boolean;
+
+        /**
+         * Get or set whether the `MenuItem` is `checked`
+         */
+        checked: boolean;
+
+        /**
+         * Get or set whether the `MenuItem` is `enabled`
+         */
+        enabled: string;
+
+        /**
+         * Get or set the `submenu` of a `MenuItem`, the `submenu` must be a `Menu` object.
+         */
+        submenu: Menu;
+
+        /**
+         * Get or set the click `callback` of a `MenuItem`
+         */
+        click: Function;
+
+        /**
+         * A single character string to specify the shortcut key for the menu item.
+         */
+        key: string;
+
+        /**
+         * A string to specify the modifier keys for the shortcut of the menu item.
+         */
+        modifiers: string;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * Emitted when user activates the menu item.
+         *
+         * @param event {string} Event name
+         * @param listener {Function} The callback that handles the `click` event.
+         */
+        on( event: 'click', listener: () => any ): this;
+    }
+
+    /* Screen: http://docs.nwjs.io/en/latest/References/Screen/ */
+    /**
+     * Screen is an instance of EventEmitter object, and you"re able to use Screen.on(...) to respond to native screen"s events.
+     * Screen is a singleton object, need to be initiated once by calling nw.Screen.Init().
+     */
+    interface Screen extends NWJS_Helpers.EventEmitter {
+
+        /**
+         * Init the Screen singleton object, you only need to call this once.
+         */
+        Init(): void;
+
+        /**
+         * Get the array of screen (number of screen connected to the computer)
+         */
+        screens: NWJS_Helpers.screen[];
+
+        /**
+         *
+         * @param sources {string[]} Array of source types.
+         * @param callback {Function} callback function with chosed streamId.
+         * - (optional) streamId {string}  streamId will be false if failed to execute or existing session is alive.
+         */
+        chooseDesktopMedia( sources: string[], callback: ( streamId?: string | boolean ) => void ): void;
+
+        /**
+         * Use this API to monitor the changes of screens and windows on desktop. This is an instance of EventEmitter.
+         */
+        DesktopCaptureMonitor: NWJS_Helpers.DesktopCaptureMonitor;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * Emitted when the screen resolution, arrangement is changed.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(screen?)} The callback that handles the `displayBoundsChanged` event.
+         * - (optional) screen {screen} screen object
+         */
+        on( event: 'displayBoundsChanged', listener: ( screen: NWJS_Helpers.screen ) => any ): this;
+
+        /**
+         * Emitted when a new screen added.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(screen?)} The callback that handles the `displayAdded` event.
+         * - (optional) screen {screen} screen object
+         */
+        on( event: 'displayAdded ', listener: ( screen: NWJS_Helpers.screen ) => any ): this;
+
+        /**
+         * Emitted when existing screen removed.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(screen?)} The callback that handles the `displayRemoved` event.
+         * - (optional) screen {screen} screen object
+         */
+        on( event: 'displayRemoved ', listener: ( screen: NWJS_Helpers.screen ) => any ): this;
+    }
+
+    /* Shell: http://docs.nwjs.io/en/latest/References/Shell/ */
+    /**
+     * `Shell` is a collection of APIs that do desktop related jobs.
+     */
+    interface Shell {
+
+        /**
+         * Open the given external URI in the desktop"s default manner.
+         *
+         * @param uri {string} A URL to open in system default manner.
+         */
+        openExternal( uri: string ): void;
+
+        /**
+         * Open the given file_path in the desktop"s default manner.
+         *
+         * @param file_path {string} path to a local file
+         */
+        openItem( file_path: string ): void;
+
+        /**
+         * Show the given file_path in the parent folder with file manager. If possible, select the file.
+         *
+         * @param file_path {string} path to a local file
+         */
+        showItemInFolder( file_path: string ): void;
+    }
+
+    /* Shortcut: http://docs.nwjs.io/en/latest/References/Shortcut/ */
+    /**
+     * `Shortcut` represents a global keyboard shortcut, also known as system-wide hotkey.
+     */
+    export class Shortcut extends NWJS_Helpers.EventEmitter {
+
+        /**
+         * Create new Shortcut.
+         *
+         * @param option {Object} Shortcut option is an object contains initial settings for the Shortcut.
+         */
+        constructor( option: NWJS_Helpers.ShortcutOption );
+
+        /**
+         * Get or set the active callback of a Shortcut. It will be called when user presses the shortcut.
+         */
+        active: Function;
+
+        /**
+         * Get or set the failed callback of a Shortcut. It will be called when application passes an invalid key , or failed to register the key.
+         *
+         * @param msg {string} Failure message
+         */
+        failed: ( msg?: string ) => any;
+
+        /**
+         * Get the key of a Shortcut.
+         */
+        key: string;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * Get or set the active callback of a Shortcut. It will be called when user presses the shortcut.
+         *
+         * @param event {string} Event name
+         * @param listener {Function} The callback that handles the `active` event.
+         */
+        on( event: 'active', listener: () => any ): this;
+
+        /**
+         * Get or set the failed callback of a Shortcut. It will be called when application passes an invalid key, or failed to register the key.
+         *
+         * @param event {string} Event name
+         * @param listener {Function(msg?)} The callback that handles the `failed` event.
+         * - (optional) msg {string} Failure message
+         */
+        on( event: 'failed', listener: ( msg?: string ) => any ): this;
+    }
+
+    /* Tray: http://docs.nwjs.io/en/latest/References/Tray/ */
+    /**
+     * `Tray` is an abstraction of different controls on different platforms, usually it"s a small icon shown on the OS"s notification area. On Mac OS X it"s called Status Item, on GTK it"s Status Icon, and on Windows it"s System Tray Icon.
+     */
+    export class Tray extends NWJS_Helpers.EventEmitter {
+        /**
+         * Create a new Tray.
+         * @param option {Object} Contains initial settings for the Tray.
+         */
+        constructor( option: NWJS_Helpers.TrayOption );
+
+        /**
+         * Get or set the title of the tray.
+         */
+        title: string;
+
+        /**
+         * Get or set the tooltip of the tray.
+         */
+        tooltip: string;
+
+        /**
+         * Get or set the icon of the tray.
+         */
+        icon: string;
+
+        /**
+         * Get or set the alternate (active) tray icon. (Mac)
+         */
+        alticon: string;
+
+        /**
+         * Get or set whether icon and alticon images are treated as "templates" (true by default). (Mac)
+         */
+        iconsAreTemplates: boolean;
+
+        /**
+         * Get or set the menu of the tray.
+         */
+        menu: Menu;
+
+        /**
+         * Remove the tray.
+         */
+        remove(): void;
+
+        on( event: string, listener: Function ): this;
+
+        /**
+         * Emitted when user clicks the menu item with left mouse button.
+         *
+         * @param event {string} Event name
+         * @param listener {Function} The callback that handles the `click` event.
+         */
+        on( event: 'click ', listener: () => any ): this;
+    }
+
+    /* Window: http://docs.nwjs.io/en/latest/References/Window/ */
+    /**
+     * Window is a wrapper of the DOM's window object. It has extended operations and can receive various window events.
+     */
+    interface Window extends NWJS_Helpers.EventEmitter {
+
+        /**
+         * Get the native Window Object.
+         *
+         * @param event {DOM Window} (Optional) Is the DOM window
+         */
+        get( window_object?: Object ): NWJS_Helpers.win;
+
+        /**
+         * Open a new window and load url in it.
+         *
+         * @param url {string} URL to be loaded in the opened window
+         * @param option {object} (Optional) New window open options like window subfields in manifest format plus some more options
+         * @param callback {string} (Optional) Callback when with the opened native Window object
+         * - (Optional) new_win {object} New opened window object.
+         */
+        open( url: string, option?: NWJS_Helpers.WindowOpenOption, callback?: ( new_win?: NWJS_Helpers.win ) => void ): void;
+    }
+
+    export var App: App;
+    export var Clipboard: Clipboard;
+    export var Screen: Screen;
+    export var Shell: Shell;
+    export var Window: Window;
+}
+
+declare module "nw.gui" {
+    export class Menu extends nw.Menu {
+    }
+    export class MenuItem extends nw.MenuItem {
+    }
+    export class Shortcut extends nw.Shortcut {
+    }
+    export class Tray extends nw.Tray {
+    }
+    export var App: nw.App;
+    export var Clipboard: nw.Clipboard;
+    export var Screen: nw.Screen;
+    export var Shell: nw.Shell;
+    export var Window: nw.Window;
+}
diff --git a/opentype/opentype-tests.ts b/opentype/opentype-tests.ts
new file mode 100644
index 0000000000..758b09283c
--- /dev/null
+++ b/opentype/opentype-tests.ts
@@ -0,0 +1,65 @@
+/// <reference path="./opentype.d.ts" />
+
+var x = 0;
+var y = 0;
+var fontSize = 72;
+var ctx: CanvasRenderingContext2D;
+
+opentype.load('fonts/Roboto-Black.ttf', function(err, font) {
+    if (err) {
+         alert('Font could not be loaded: ' + err);
+    } else {
+        var path = font.getPath('Hello, World!', 0, 150, 72);
+        // If you just want to draw the text you can also use font.draw(ctx, text, x, y, fontSize).
+        path.draw(ctx);
+    }
+});
+
+var myBuffer: ArrayBuffer;
+var font = opentype.parse(myBuffer);
+font = opentype.loadSync('fonts/Roboto-Black.ttf');
+
+var notdefGlyph = new opentype.Glyph({
+    name: '.notdef',
+    unicode: 0,
+    advanceWidth: 650,
+    path: new opentype.Path()
+});
+
+var aPath = new opentype.Path();
+aPath.moveTo(100, 0);
+aPath.lineTo(100, 700);
+// more drawing instructions...
+var aGlyph = new opentype.Glyph({
+    name: 'A',
+    unicode: 65,
+    advanceWidth: 650,
+    path: aPath
+});
+
+var glyphs = [notdefGlyph, aGlyph];
+var font = new opentype.Font({
+    familyName: 'OpenTypeSans',
+    styleName: 'Medium',
+    unitsPerEm: 1000,
+    ascender: 800,
+    descender: -200,
+    glyphs: glyphs});
+font.download();
+
+font.getPath('text', x, y, fontSize);
+font.draw(ctx, 'text', x, y, fontSize);
+font.drawPoints(ctx, 'text', x, y, fontSize);
+font.drawMetrics(ctx, 'text', x, y, fontSize);
+font.stringToGlyphs('string');
+font.charToGlyph('c');
+font.getKerningValue(notdefGlyph, aGlyph);
+
+aGlyph.getPath(x, y, fontSize);
+aGlyph.draw(ctx, x, y, fontSize);
+aGlyph.drawPoints(ctx, x, y, fontSize);
+aGlyph.drawMetrics(ctx, x, y, fontSize);
+
+aPath.draw(ctx);
+aPath.toPathData(7);
+aPath.toSVG(7);
diff --git a/opentype/opentype.d.ts b/opentype/opentype.d.ts
new file mode 100644
index 0000000000..fec42369a1
--- /dev/null
+++ b/opentype/opentype.d.ts
@@ -0,0 +1,248 @@
+// Type definitions for opentype.js
+// Project: https://github.com/nodebox/opentype.js
+// Definitions by: Dan Marshall <https://github.com/danmarshall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace opentypejs {
+
+    interface Contour extends Array<Point> {
+    }
+
+    class Encoding {
+        charset: string;
+        charToGlyphIndex(c: string): number;
+        font: Font;
+    }
+
+    interface Field {
+        name: string;
+        type: string;
+        value: any;
+    }
+
+    class Font {
+        private nametoGlyphIndex;
+        private supported;
+        constructor(options: FontOptions);
+        ascender: number;
+        cffEncoding: Encoding;
+        charToGlyph(c: string): Glyph;
+        charToGlyphIndex(s: string): number;
+        descender: number;
+        download(): void;
+        draw(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
+        drawMetrics(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
+        drawPoints(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
+        encoding: Encoding;
+        forEachGlyph(text: string, x: number, y: number, fontSize: number, options: RenderOptions, callback: { (glyph: Glyph, x: number, y: number, fontSize: number, options?: RenderOptions): void; }): void;
+        getEnglishName(name: string): string;
+        getGposKerningValue: { (leftGlyph: Glyph | number, rightGlyph: Glyph | number): number; };
+        getKerningValue(leftGlyph: Glyph | number, rightGlyph: Glyph | number): number;
+        getPath(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path;
+        getPaths(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path[];
+        glyphs: GlyphSet;
+        glyphIndexToName(gid: number): string;
+        glyphNames: GlyphNames;
+        hasChar(c: string): boolean;
+        kerningPairs: KerningPairs;
+        names: FontNames;
+        nameToGlyph(name: string): Glyph;
+        nameToGlyphIndex(name: string): number;
+        numberOfHMetrics: number;
+        numGlyphs: number;
+        outlinesFormat: string;
+        stringToGlyphs(s: string): Glyph[];
+        tables: { [tableName: string]: Table; };
+        toArrayBuffer(): ArrayBuffer;
+        toBuffer(): ArrayBuffer;
+        toTables(): Table;
+        unitsPerEm: number;
+        validate(): void;
+    }
+
+    interface FontNames {
+        copyright: LocalizedName;
+        description: LocalizedName;
+        designer: LocalizedName;
+        designerURL: LocalizedName;
+        fontFamily: LocalizedName;
+        fontSubfamily: LocalizedName;
+        fullName: LocalizedName;
+        license: LocalizedName;
+        licenseURL: LocalizedName;
+        manufacturer: LocalizedName;
+        manufacturerURL: LocalizedName;
+        postScriptName: LocalizedName;
+        trademark: LocalizedName;
+        version: LocalizedName;
+    }
+
+    interface FontOptions {
+        copyright?: string;
+        ascender?: number;
+        descender?: number;
+        description?: string;
+        designer?: string;
+        designerURL?: string;
+        empty?: boolean;
+        familyName?: string;
+        fullName?: string;
+        glyphs?: Glyph[] | GlyphSet;
+        license?: string;
+        licenseURL?: string;
+        manufacturer?: string;
+        manufacturerURL?: string;
+        postScriptName?: string;
+        styleName?: string;
+        unitsPerEm?: number;
+        trademark?: string;
+        version?: string;
+    }
+
+    class Glyph {
+        private index;
+        private xMin;
+        private xMax;
+        private yMin;
+        private yMax;
+        private points;
+        constructor(options: GlyphOptions);
+        addUnicode(unicode: number): void;
+        advanceWidth: number;
+        bindConstructorValues(options: GlyphOptions): void;
+        draw(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
+        drawMetrics(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
+        drawPoints(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
+        getContours(): Contour[];
+        getMetrics(): Metrics;
+        getPath(x: number, y: number, fontSize: number): Path;
+        name: string;
+        path: Path | { (): Path; };
+        unicode: number;
+        unicodes: number[];
+    }
+
+    interface GlyphOptions {
+        advanceWidth?: number;
+        index?: number;
+        font?: Font;
+        name?: string;
+        path?: Path;
+        unicode?: number;
+        unicodes?: number[];
+        xMax?: number;
+        xMin?: number;
+        yMax?: number;
+        yMin?: number;
+    }
+
+    class GlyphNames {
+        private names;
+        constructor(post: Post);
+        glyphIndexToName(gid: number): string;
+        nameToGlyphIndex(name: string): number;
+    }
+
+    class GlyphSet {
+        private font;
+        private glyphs;
+        constructor(font: Font, glyphs: Glyph[] | { (): Glyph; }[]);
+        get(index: number): Glyph;
+        length: number;
+        push(index: number, loader: { (): Glyph; }): void;
+    }
+
+    interface KerningPairs {
+        [pair: string]: number;
+    }
+
+    function load(url: string, callback: { (error: any, font?: Font): void; }): void;
+
+    function loadSync(url: string): Font;
+
+    interface LocalizedName {
+        [lang: string]: string;
+    }
+
+    interface Metrics {
+        leftSideBearing: number;
+        rightSideBearing?: number;
+        xMax: number;
+        xMin: number;
+        yMax: number;
+        yMin: number;
+    }
+
+    function parse(buffer: any): Font;
+
+    class Path {
+        private fill;
+        private stroke;
+        private strokeWidth;
+        constructor();
+        bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): void;
+        close: () => void;
+        closePath(): void;
+        commands: PathCommand[];
+        curveTo: (x1: number, y1: number, x2: number, y2: number, x: number, y: number) => void;
+        draw(ctx: CanvasRenderingContext2D): void;
+        extend(pathOrCommands: Path | PathCommand[]): void;
+        lineTo(x: number, y: number): void;
+        moveTo(x: number, y: number): void;
+        quadraticCurveTo(x1: number, y1: number, x: number, y: number): void;
+        quadTo: (x1: number, y1: number, x: number, y: number) => void;
+        toPathData(decimalPlaces: number): string;
+        toSVG(decimalPlaces: number): string;
+        unitsPerEm: number;
+    }
+
+    interface PathCommand {
+        type: string;
+        x?: number;
+        y?: number;
+        x1?: number;
+        y1?: number;
+        x2?: number;
+        y2?: number;
+    }
+
+    interface Point {
+        lastPointOfContour?: boolean;
+    }
+
+    interface Post {
+        glyphNameIndex?: number[];
+        isFixedPitch: number;
+        italicAngle: number;
+        maxMemType1: number;
+        minMemType1: number;
+        maxMemType42: number;
+        minMemType42: number;
+        names?: string[];
+        numberOfGlyphs?: number;
+        offset?: number[];
+        underlinePosition: number;
+        underlineThickness: number;
+        version: number;
+    }
+
+    interface RenderOptions {
+        kerning: boolean;
+    }
+
+    interface Table {
+        [propName: string]: any;
+        encode(): number[];
+        fields: Field[];
+        sizeOf(): number;
+        tables: Table[];
+        tableName: string;
+    }
+
+}
+
+declare var opentype: typeof opentypejs;
+
+declare module "opentype.js" {
+    export = opentype;
+}
diff --git a/passport-google-oauth/passport-google-oauth-tests.ts b/passport-google-oauth/passport-google-oauth-tests.ts
index ef7a4e9ef9..e2d47c23b2 100644
--- a/passport-google-oauth/passport-google-oauth-tests.ts
+++ b/passport-google-oauth/passport-google-oauth-tests.ts
@@ -18,10 +18,11 @@ passport.use(new google.OAuthStrategy({
             consumerSecret: process.env.GOOGLE_CONSUMER_SECRET,
             callbackURL: process.env.PASSPORT_GOOGLE_CALLBACK_URL
     },
-    function(accessToken:string, refreshToken:string, profile:google.Profile, done:(error:any, user?:any) => void) {
+    function(accessToken:string, refreshToken:string, profile:google.Profile, done:(error:any, user?:any, msg?: google.VerifyOptions) => void) {
          User.findOrCreate(profile.id, profile.provider, function(err, user) {
              if (err) { return done(err); }
-             done(null, user);
+             else if(!user) return done(null, false, {message: 'not found user'});
+             return done(null, user);
          });
     })
 );
diff --git a/passport-google-oauth/passport-google-oauth.d.ts b/passport-google-oauth/passport-google-oauth.d.ts
index 11645c4411..fd24eb3323 100644
--- a/passport-google-oauth/passport-google-oauth.d.ts
+++ b/passport-google-oauth/passport-google-oauth.d.ts
@@ -28,9 +28,17 @@ declare module 'passport-google-oauth' {
         sessionKey?: string;
     }
 
+    interface VerifyOptions {
+        message: string;
+    }
+
+    interface VerifyFunction {
+        (error: any, user?: any, msg?: VerifyOptions): void;
+    }
+
     class OAuthStrategy implements passport.Strategy {
         constructor(options: IOAuthStrategyOption,
-                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
+                    verify: (accessToken: string, refreshToken: string, profile: Profile, done: VerifyFunction) => void);
         name: string;
         authenticate: (req: express.Request, options?: Object) => void;
     }
diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 36d5c1ab23..3c181e2a9e 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -502,6 +502,33 @@ export class ReactBootstrapTest extends Component<any, any> {
                   </Tabs>
                 </div>
 
+                <div style={style}>
+                  <Tab.Container id="left-tabs-example" defaultActiveKey="first">
+                    <Row className="clearfix">
+                      <Col sm={4}>
+                        <Nav bsStyle="pills" stacked>
+                          <NavItem eventKey="first">
+                            Tab 1
+                          </NavItem>
+                          <NavItem eventKey="second">
+                            Tab 2
+                          </NavItem>
+                        </Nav>
+                      </Col>
+                      <Col sm={8}>
+                        <Tab.Content animation>
+                          <Tab.Pane eventKey="first">
+                            Tab 1 content
+                          </Tab.Pane>
+                          <Tab.Pane eventKey="second">
+                            Tab 2 content
+                          </Tab.Pane>
+                        </Tab.Content>
+                      </Col>
+                    </Row>
+                  </Tab.Container>
+                </div>
+
                 <div style={style}>
                   <Pager>
                     <PageItem href='#'>Previous</PageItem>
diff --git a/react-bootstrap/react-bootstrap.d.ts b/react-bootstrap/react-bootstrap.d.ts
index 366eeef7b5..6b962ae8fa 100644
--- a/react-bootstrap/react-bootstrap.d.ts
+++ b/react-bootstrap/react-bootstrap.d.ts
@@ -435,8 +435,39 @@ declare module "react-bootstrap" {
         animation?: boolean;
         eventKey?: any; // TODO: Add more specific type
     }
-    type Tab = React.ClassicComponent<TabProps, {}>;
-    var Tab: React.ClassicComponentClass<TabProps>;
+    interface TabClass extends React.ClassicComponentClass<TabProps> {
+      Container: TabContainer;
+      Pane: TabPane;
+      Content: TabClass;
+    }
+    type Tab = TabClass;
+    var Tab: TabClass;
+    
+    // <Tab.Container />
+    // ----------------------------------------
+    interface TabContainerProps extends React.HTMLAttributes {
+      activeKey?: any;
+      defaultActiveKey?: any;
+      generateChildId?: (eventKey: any, type: any) => string;
+    }
+    type TabContainer = React.ClassicComponentClass<TabContainerProps>;
+    
+    // <Tab.Pane />
+    // ----------------------------------------
+    interface TabPaneProps extends React.HTMLAttributes {
+      animation?: boolean | React.ComponentClass<any>;
+      'aria-labelledby'?: string;
+      bsClass?: string;
+      eventKey?: any;
+      onEnter?: Function;
+      onEntered?: Function;
+      onEntering?: Function;
+      onExit?: Function;
+      onExited?: Function;
+      onExiting?: Function;
+      unmountOnExit?: boolean;
+    }
+    type TabPane = React.ClassicComponentClass<TabPaneProps>;
 
     // <Pager />
     // ----------------------------------------
diff --git a/react-codemirror/react-codemirror-tests.tsx b/react-codemirror/react-codemirror-tests.tsx
new file mode 100644
index 0000000000..185f3b229d
--- /dev/null
+++ b/react-codemirror/react-codemirror-tests.tsx
@@ -0,0 +1,40 @@
+/// <reference path="../react/react.d.ts" />
+/// <reference path="../react/react-dom.d.ts" />
+/// <reference path="./react-codemirror.d.ts" />
+
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import * as Codemirror from "react-codemirror";
+
+class CodemirrorTest extends React.Component<React.Props<{}>, {}> {
+    private editorRef: ReactCodeMirror.ReactCodeMirror;
+
+    componentDidMount() {
+        this.editorRef.focus();
+        this.editorRef.getCodeMirror();
+    }
+
+    render() {
+        const options = {
+            lineNumbers: true,
+            readOnly: false,
+            mode: "markdown"
+        };
+        const onChange = (value: any) => console.log(value);
+        const onFocusChange = (focused: boolean) => console.log(focused);
+        const onScroll = (scrollInfo: CodeMirror.ScrollInfo) => console.log(scrollInfo.top);
+        const codeMirrorInstance = CodeMirror(document.body);
+
+        return <div>
+            <Codemirror className="test-codemirror"
+                        codeMirrorInstance={codeMirrorInstance}
+                        onChange={onChange}
+                        onFocusChange={onFocusChange}
+                        onScroll={onScroll}
+                        options={options}
+                        path="editor"
+                        ref={(r: ReactCodeMirror.ReactCodeMirror) => this.editorRef = r}
+                        value="foo bar" />
+        </div>;
+    }
+}
diff --git a/react-codemirror/react-codemirror.d.ts b/react-codemirror/react-codemirror.d.ts
new file mode 100644
index 0000000000..12311a2665
--- /dev/null
+++ b/react-codemirror/react-codemirror.d.ts
@@ -0,0 +1,35 @@
+// Type definitions for React Codemirror v0.2.6
+// Project: https://github.com/JedWatson/react-codemirror
+// Definitions by: Vicky Lai <https://github.com/velveret>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts"/>
+/// <reference path="../codemirror/codemirror.d.ts"/>
+
+declare namespace ReactCodeMirror {
+    interface ReactCodeMirrorProps extends __React.Props<ReactCodeMirror> {
+        onChange?: (newValue: string) => any; // called when a change is made
+        onFocusChange?: (focused: boolean) => any; // called when the editor is focused or loses focus
+        onScroll?: (scrollInfo: CodeMirror.ScrollInfo) => any; // called when the editor is scrolled
+        options?: CodeMirror.EditorConfiguration; // options passed to the CodeMirror instance
+        path?: string; // the identifying name for the textarea
+        value?: string; // the editor value
+        className?: string; // CSS className for the outer element
+        codeMirrorInstance?: CodeMirror.Editor; // the CodeMirror instance
+    }
+
+    interface ReactCodeMirror extends __React.Component<ReactCodeMirrorProps, {}> {
+        /** Focuses the CodeMirror instance. */
+        focus(): void;
+
+        /** Returns the CodeMirror instance, if available. */
+        getCodeMirror(): CodeMirror.Editor;
+    }
+
+    interface ReactCodeMirrorClass extends __React.ComponentClass<ReactCodeMirrorProps> { }
+}
+
+declare module "react-codemirror" {
+    const RCM: ReactCodeMirror.ReactCodeMirrorClass;
+    export = RCM;
+}
diff --git a/react-helmet/react-helmet.d.ts b/react-helmet/react-helmet.d.ts
index b5b69411ee..2ea19ae469 100644
--- a/react-helmet/react-helmet.d.ts
+++ b/react-helmet/react-helmet.d.ts
@@ -9,21 +9,23 @@ declare namespace ReactHelmet {
     import React = __React;
     
     interface HelmetProps {
-        title?: string;
-        titleTemplate?: string;
         base?: any;
+        htmlAttributes?: any;
         link?: Array<any>;
         meta?: Array<any>;
         script?: Array<any>;
+        title?: string;
+        titleTemplate?: string;
         onChangeClientState?: (newState: any) => void;
     }
 
     interface HelmetData {
-        title: HelmetDatum;
         base: HelmetDatum;
+        htmlAttributes: HelmetDatum;
         link: HelmetDatum;
         meta: HelmetDatum;
         script: HelmetDatum;
+        title: HelmetDatum;
     }
     
     interface HelmetDatum {
diff --git a/react-native/react-native-tests.tsx b/react-native/react-native-tests.tsx
index 6079637ce6..d33918dbd6 100644
--- a/react-native/react-native-tests.tsx
+++ b/react-native/react-native-tests.tsx
@@ -51,7 +51,13 @@ function testDimensions() {
 BackAndroid.addEventListener("hardwareBackPress", () => {
 });
 
-var styles = StyleSheet.create(
+interface LocalStyles {
+    container: React.ViewStyle;
+    welcome: React.TextStyle;
+    instructions: React.TextStyle;
+}
+
+var styles = StyleSheet.create<LocalStyles>(
     {
         container:    {
             flex:            1,
@@ -74,13 +80,18 @@ var styles = StyleSheet.create(
 
 
 class Welcome extends React.Component<any,any> {
-
+  
+    refs: {
+      [key: string]: any
+      rootView: View
+    }
+  
     testNativeMethods() {
-      this.setNativeProps({});
+      // this.setNativeProps({});
 
       const { rootView } = this.refs;
 
-      rootView.measure((x, y, width, height) => {
+      rootView.measure((x: number, y: number, width: number, height: number) => {
       });
     }
 
diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
index d0bbf5aea8..8be6ac8d56 100644
--- a/react-native/react-native.d.ts
+++ b/react-native/react-native.d.ts
@@ -5522,7 +5522,7 @@ declare namespace  __React {
     }
     
     export interface NavigationHeaderProps {
-        renderTitleComponent?(props: Object): JSX.element
+        renderTitleComponent?(props: Object): JSX.Element
     }
     
     export interface NavigationHeaderStatic extends React.ComponentClass<NavigationHeaderProps> {
@@ -5535,7 +5535,7 @@ declare namespace  __React {
         style?: ViewStyle
         navigationState?: any
         onNavigate(action: Object): boolean
-        renderScene?(props): JSX.Element
+        renderScene?(props: any /* undocumented on 0.27 */): JSX.Element
     }
     
     export interface NavigationCardStackStatic extends React.ComponentClass<NavigationCardStackProps> {
@@ -5547,6 +5547,26 @@ declare namespace  __React {
         Header: NavigationHeaderStatic;
         Reducer: NavigationReducerStatic;
     }
+    
+    export interface NavigationContainerProps {
+        tabs: NavigationTab[];
+        index: number;
+    }
+
+    export interface NavigationContainerStatic extends React.ComponentClass<NavigationContainerProps> {
+        create(inClass: any): any;
+    }
+
+    export interface NavigationRootContainerProps extends React.Props<NavigationRootContainerStatic> {
+        renderNavigation: NavigationRenderer;
+        reducer: NavigationReducerStatic;
+        persistenceKey?: string;
+    }
+
+    export interface NavigationRootContainerStatic extends React.ComponentClass<NavigationRootContainerProps> {
+        getBackAction(): NavigationAction;
+        handleNavigation( action: NavigationAction ): boolean;
+    }
 
     //////////////////////////////////////////////////////////////////////////
     //
@@ -5618,7 +5638,7 @@ declare namespace  __React {
     export type StyleSheet = StyleSheetStatic
     
     export var SwipeableListView: SwipeableListViewStatic
-    export type SwipeableListView = SwipeableListViewStatci
+    export type SwipeableListView = SwipeableListViewStatic
 
     export var Switch: SwitchStatic
     export type Switch = SwitchStatic
@@ -5741,9 +5761,6 @@ declare namespace  __React {
 
     export type NavigationReducer = NavigationReducerStatic;
     export var NavigationReducer: NavigationReducerStatic;
-    
-    export type SwipeableListView = SwipeableListViewStatic;
-    export var SwipeableListView: SwipeableListViewStatic;
 
     export type Easing = EasingStatic;
     export var Easing: EasingStatic;
diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index 615f0bb355..ad1648dfa5 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -484,6 +484,7 @@ declare module "react-router" {
     export type RouterState = ReactRouter.RouterState
     export type HistoryBase = ReactRouter.HistoryBase
     export type RouterOnContext = ReactRouter.RouterOnContext
+    export type RouteProps = ReactRouter.RouteProps
 
     export {
         Router,
diff --git a/react/react-addons-perf.d.ts b/react/react-addons-perf.d.ts
index 6a40a2c402..3fe17e0133 100644
--- a/react/react-addons-perf.d.ts
+++ b/react/react-addons-perf.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React v0.14 (react-addons-perf)
+// Type definitions for React v15.1.0 (react-addons-perf)
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -31,11 +31,18 @@ declare namespace __React {
         namespace Perf {
             export function start(): void;
             export function stop(): void;
-            export function printInclusive(measurements: Measurements[]): void;
-            export function printExclusive(measurements: Measurements[]): void;
-            export function printWasted(measurements: Measurements[]): void;
-            export function printDOM(measurements: Measurements[]): void;
+            export function printInclusive(measurements?: Measurements[]): void;
+            export function printExclusive(measurements?: Measurements[]): void;
+            export function printWasted(measurements?: Measurements[]): void;
+            export function printOperations(measurements?: Measurements[]): void;
             export function getLastMeasurements(): Measurements[];
+            export function getExclusive(measurements?: Measurements[]): any;
+            export function getInclusive(measurements?: Measurements[]): any;
+            export function getWasted(measurements?: Measurements[]): any;
+            export function getOperations(measurements?: Measurements[]): any;
+
+            // Renamed to printOperations().  Please use it instead.
+            export function printDOM(measurements?: Measurements[]): void;
         }
     }
 }
diff --git a/react/react-global-tests.ts b/react/react-global-tests.ts
index 1ed7f8484e..8fce3ede9c 100644
--- a/react/react-global-tests.ts
+++ b/react/react-global-tests.ts
@@ -404,7 +404,13 @@ var measurements = React.addons.Perf.getLastMeasurements();
 React.addons.Perf.printInclusive(measurements);
 React.addons.Perf.printExclusive(measurements);
 React.addons.Perf.printWasted(measurements);
+React.addons.Perf.printOperations(measurements);
 React.addons.Perf.printDOM(measurements);
+React.addons.Perf.printInclusive();
+React.addons.Perf.printExclusive();
+React.addons.Perf.printWasted();
+React.addons.Perf.printOperations();
+React.addons.Perf.printDOM();
 
 //
 // PureRenderMixin addon
diff --git a/react/react-tests.ts b/react/react-tests.ts
index 5976fb23bd..b914923e4b 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -534,7 +534,24 @@ var measurements = Perf.getLastMeasurements();
 Perf.printInclusive(measurements);
 Perf.printExclusive(measurements);
 Perf.printWasted(measurements);
+Perf.printOperations(measurements);
+Perf.printInclusive();
+Perf.printExclusive();
+Perf.printWasted();
+Perf.printOperations();
+
+console.log(Perf.getExclusive());
+console.log(Perf.getInclusive());
+console.log(Perf.getWasted());
+console.log(Perf.getOperations());
+console.log(Perf.getExclusive(measurements));
+console.log(Perf.getInclusive(measurements));
+console.log(Perf.getWasted(measurements));
+console.log(Perf.getOperations(measurements));
+
+// Renamed to printOperations().  Please use it instead.
 Perf.printDOM(measurements);
+Perf.printDOM();
 
 //
 // PureRenderMixin addon
diff --git a/redis/redis.d.ts b/redis/redis.d.ts
index d76b35f501..6dd257bd9b 100644
--- a/redis/redis.d.ts
+++ b/redis/redis.d.ts
@@ -364,6 +364,8 @@ declare module "redis" {
         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;
diff --git a/redlock/redlock-tests.ts b/redlock/redlock-tests.ts
index 8c05f6441e..309f687fbb 100644
--- a/redlock/redlock-tests.ts
+++ b/redlock/redlock-tests.ts
@@ -1,103 +1,49 @@
 /// <reference path="./redlock.d.ts" />
 
-import Redlock = require('redlock');
+import * as Redlock from 'redlock';
+import * as Promise from 'bluebird';
+import {RedisClient} from 'redis';
 
-import NodeifyCallback = RedlockTypes.NodeifyCallback;
-import Lock = RedlockTypes.Lock;
-import RedlockOptions = RedlockTypes.RedlockOptions;
+import Lock = Redlock.Lock;
 
 namespace RedlockTest {
-	// constructor
-	{
-		let redlock: Redlock;
-		let client: any;
-		let options: RedlockOptions;
-		redlock = new Redlock([client]);
-		redlock = new Redlock([client], options);
-	}
+	
+	let redlock: Redlock;
+	let client: RedisClient;
+	let lock: Lock;
+	
+	redlock = new Redlock([client]);
+	redlock = new Redlock([client], {
+		driftFactor: 0.1,
+		retryCount: 2,
+		retryDelay: 3
+	});
+	
+	redlock.acquire('resource', 30).then((lock: Lock) => {});
+	redlock.acquire('resource', 30, (err: any, lock: Lock) => {});
+	redlock.lock('resource', 30).then((lock: Lock) => {});
+	redlock.lock('resource', 30, (err: any, lock: Lock) => {});
 
-	// acquire, lock
-	{
-		let redlock: Redlock;
-		let resource: string;
-		let ttl: number;
-		let callback: NodeifyCallback<Lock>;
-		let result: Promise<Lock>;
-		result = redlock.acquire(resource, ttl);
-		result = redlock.acquire(resource, ttl, callback);
-		result = redlock.lock(resource, ttl);
-		result = redlock.lock(resource, ttl, callback);
-	}
+	// There is currently no way to test the disposer as the bluebird typings does not
+	//	expose the .using method.
+	// promise.using(redlock.disposer('resource', 30), (lock: Lock) => {});
+	
+	redlock.release(lock);
+	redlock.release(lock, (err: any) => {});
+	redlock.unlock(lock);
+	redlock.unlock(lock, (err: any) => {});
 
-	// disposer
-	{
-		let redlock: Redlock;
-		let resource: string;
-		let ttl: number;
-		let result: any;
-		result = redlock.acquire(resource, ttl);
-	}
-
-	// release, unlock
-	{
-		let redlock: Redlock;
-		let lock: Lock;
-		let callback: NodeifyCallback<void>;
-		let result: Promise<void>;
-		result = redlock.release(lock);
-		result = redlock.release(lock, callback);
-		result = redlock.unlock(lock);
-		result = redlock.unlock(lock, callback);
-	}
-
-	// extend
-	{
-		let redlock: Redlock;
-		let lock: Lock;
-		let ttl: number;
-		let callback: NodeifyCallback<Lock>;
-		let result: Promise<Lock>;
-		result = redlock.extend(lock, ttl);
-		result = redlock.extend(lock, ttl, callback);
-	}
-
-	// _lock
-	{
-		let redlock: Redlock;
-		let resource: string;
-		let value: string;
-		let ttl: number;
-		let callback: NodeifyCallback<Lock>;
-		let result: Promise<Lock>;
-		result = redlock._lock(resource, value, ttl);
-		result = redlock._lock(resource, value, ttl, callback);
-	}
-
-	// _random
-	{
-		let redlock: Redlock;
-		let result: string;
-		result = redlock._random();
-	}
+	redlock.extend(lock, 30).then((lock: Lock) => {});
+	redlock.extend(lock, 30, (err: any, lock: Lock) => {});
 }
 
 namespace LockTest {
-	// unlock
-	{
-		let lock: Lock;
-		let callback: NodeifyCallback<void>;
-		let result: Promise<void>;
-		result = lock.unlock();
-		result = lock.unlock(callback);
-	}
-
-	// extend
-	{
-		let lock: Lock;
-		let ttl: number;
-		let callback: NodeifyCallback<Lock>;
-		let result: Promise<Lock>;
-		result = lock.extend(ttl);
-		result = lock.extend(ttl, callback);
-	}
+	
+	let lock: Lock;
+	
+	lock.unlock();
+	lock.unlock((err) => {});
+	
+	lock.extend(30).then((lock: Lock) => {});
+	lock.extend(30, (err: any, lock: Lock) => {});
 }
diff --git a/redlock/redlock.d.ts b/redlock/redlock.d.ts
index 6db97b9f9e..94ee8f3c7a 100644
--- a/redlock/redlock.d.ts
+++ b/redlock/redlock.d.ts
@@ -4,59 +4,61 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="../bluebird/bluebird.d.ts" />
+/// <reference path="../redis/redis.d.ts" />
 
-declare namespace RedlockTypes {
-	interface LockError extends Error {}
 
-	interface NodeifyCallback<T> {
-		(err: any, value?: T): void;
+declare module "redlock" {
+
+	import * as redis from 'redis';
+	import * as Promise from 'bluebird';	
+		
+	namespace Redlock {
+		
+		interface Callback<T> {
+			(err: any, value?: T): void;
+		}
+
+		interface Lock {
+			
+			redlock: Redlock;
+			resource: string;
+			value: any;
+			expiration: number;
+
+			unlock(callback?: Callback<void>): Promise<void>;
+
+			extend(ttl: number, callback?: Callback<Lock>): Promise<Lock>;
+		}
+
+		interface Options {
+			driftFactor?: number;
+			retryCount?: number;
+			retryDelay?: number;
+		}
+
+		interface LockError extends Error {}
 	}
-
-	interface Lock {
-		redlock: Redlock;
-		resource: string;
-		value: any;
-		expiration: number;
-
-		unlock(callback?: NodeifyCallback<void>): Promise<void>;
-
-		extend(ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-	}
-
-	interface RedlockOptions {
-		driftFactor?: number;
-		retryCount?: number;
-		retryDelay?: number;
-	}
-
+	
 	class Redlock {
-		LockError: LockError;
 
 		driftFactor: number;
 		retryCount: number;
 		retryDelay: number;
 
-		servers: any[]; // array of redis.RedisClient
+		servers: redis.RedisClient[];
 
-		constructor(clients: any[], options?: RedlockOptions);
+		constructor(clients: any[], options?: Redlock.Options);
 
-		acquire(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-		lock(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
+		acquire(resource: string, ttl: number, callback?: Redlock.Callback<Redlock.Lock>): Promise<Redlock.Lock>;
+		lock(resource: string, ttl: number, callback?: Redlock.Callback<Redlock.Lock>): Promise<Redlock.Lock>;
 
-		disposer(resource: string, ttl: number): any; // return bluebird.Disposer
+		disposer(resource: string, ttl: number, errorHandler?: Redlock.Callback<void>): any; // bluebird Disposer
 
-		release(lock: Lock, callback?: NodeifyCallback<void>): Promise<void>;
-		unlock(lock: Lock, callback?: NodeifyCallback<void>): Promise<void>;
+		release(lock:  Redlock.Lock, callback?: Redlock.Callback<void>): Promise<void>;
+		unlock(lock:  Redlock.Lock, callback?: Redlock.Callback<void>): Promise<void>;
 
-		extend(lock: Lock, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-
-		_lock(resource: string, value: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
-
-		_random(): string;
+		extend(lock:  Redlock.Lock, ttl: number, callback?: Redlock.Callback<Redlock.Lock>): Promise<Redlock.Lock>;
 	}
-}
-
-declare module "redlock" {
-	import Redlock = RedlockTypes.Redlock;
+	
 	export = Redlock;
 }
diff --git a/redux-logger/redux-logger-tests.ts b/redux-logger/redux-logger-tests.ts
index d93aa7e7da..8341c3eaa6 100644
--- a/redux-logger/redux-logger-tests.ts
+++ b/redux-logger/redux-logger-tests.ts
@@ -13,7 +13,9 @@ let loggerSimpleOpts = createLogger({
   predicate: (getState, action) => true,
   stateTransformer: (state) => state,
   actionTransformer: (action) => action,
-  errorTransformer: (error) => error
+  errorTransformer: (error) => error,
+  diff: true,
+  diffPredicate: (getState, action) => true,
 });
 
 let loggerCollapsedBool = createLogger({
diff --git a/redux-logger/redux-logger.d.ts b/redux-logger/redux-logger.d.ts
index f97ff95447..53f7718de1 100644
--- a/redux-logger/redux-logger.d.ts
+++ b/redux-logger/redux-logger.d.ts
@@ -40,6 +40,8 @@ declare module 'redux-logger' {
     stateTransformer?: (state: any) => any;
     actionTransformer?: (action: any) => any;
     errorTransformer?: (error: any) => any;
+    diff?: boolean;
+    diffPredicate?: LoggerPredicate;
   }
 
   // Trickery to get TypeScript to accept that our anonymous, non-default export is a function.
diff --git a/request-ip/request-ip-tests.ts b/request-ip/request-ip-tests.ts
index 8c5111e331..a4bf5f96d6 100644
--- a/request-ip/request-ip-tests.ts
+++ b/request-ip/request-ip-tests.ts
@@ -4,6 +4,10 @@
 import express = require('express');
 import requestIp = require('request-ip');
 
+var app = express();
+
+app.use(requestIp.mw());
+
 var ipMiddleware = function(req:express.Request, res:express.Response, next:Function) {
     var clientIp = requestIp.getClientIp(req);
     next();
diff --git a/request-ip/request-ip.d.ts b/request-ip/request-ip.d.ts
index 11ed21d63a..6dbff54d6b 100644
--- a/request-ip/request-ip.d.ts
+++ b/request-ip/request-ip.d.ts
@@ -28,5 +28,11 @@ declare module "request-ip" {
         };
     }
 
+    interface Options {
+        attributeName: string;
+    }
+
     export function getClientIp(req:Request):string;
+
+    export function mw(options?: Options): (req: Request, res: any, next: any) => any;
 }
diff --git a/resolve/resolve-tests.ts b/resolve/resolve-tests.ts
new file mode 100644
index 0000000000..5922f3f0a8
--- /dev/null
+++ b/resolve/resolve-tests.ts
@@ -0,0 +1,83 @@
+/// <reference path="resolve.d.ts" />
+
+import * as fs from 'fs';
+import * as resolve from 'resolve';
+
+function test_basic_async() {
+  resolve('typescript', function(error, resolved) {
+    if (error) {
+      console.error(error.message);
+      return;
+    }
+    console.log(resolved);
+  });
+}
+
+function test_basic_sync() {
+  var resolved = resolve.sync('typescript');
+  console.log(resolved);
+}
+
+function test_options_async() {
+  resolve('typescript', {
+    basedir: process.cwd(),
+    package: {},
+    extensions: ['.js'],
+    packageFilter: function(pkg, pkgfile) {
+      return pkg;
+    },
+    pathFilter: function(pkg, path, relativePath) {
+      return path
+    },
+    paths: [process.cwd()],
+    moduleDirectory: 'node_modules',
+    readFile: fs.readFile,
+    isFile: function(file, cb) {
+      fs.stat(file, function(error, stat) {
+        if (error && error.code === 'ENOENT') {
+          return cb(null, false);
+        } else if (error) {
+          return cb(error);
+        } else {
+          return cb(null, stat.isFile());
+        }
+      });
+    }
+  }, function(error, resolved) {
+    if (error) {
+      console.error(error.message);
+      return;
+    }
+    console.log(resolved);
+  });
+}
+
+function test_options_sync() {
+  var resolved = resolve.sync('typescript', {
+    basedir: process.cwd(),
+    package: {},
+    extensions: ['.js'],
+    packageFilter: function(pkg, pkgfile) {
+      return pkg;
+    },
+    pathFilter: function(pkg, path, relativePath) {
+      return path
+    },
+    paths: [process.cwd()],
+    moduleDirectory: 'node_modules',
+    readFileSync: fs.readFileSync,
+    isFile: function(file) {
+      try {
+        return fs.statSync(file).isFile();
+      } catch (error) {
+        return false;
+      }
+    }
+  });
+  console.log(resolved);
+}
+
+function test_is_core() {
+  var fsIsCore = resolve.isCore('fs');
+  var typescriptIsCore = resolve.isCore('typescript');
+}
diff --git a/resolve/resolve.d.ts b/resolve/resolve.d.ts
new file mode 100644
index 0000000000..83082d7006
--- /dev/null
+++ b/resolve/resolve.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for resolve
+// Project: https://github.com/substack/node-resolve
+// Definitions by: Mario Nebl <https://github.com/marionebl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'resolve' {
+  /**
+   * Callback invoked when resolving asynchronously
+   *
+   * @param error
+   * @param resolved Absolute path to resolved identifier
+   */
+  type resolveCallback = (err: Error, resolved?: string) => void;
+
+  /**
+   * Callback invoked when checking if a file exists
+   *
+   * @param error
+   * @param isFile If the given file exists
+   */
+  type isFileCallback = (err: Error, isFile?: boolean) => void;
+
+  /**
+   * Callback invoked when reading a file
+   *
+   * @param error
+   * @param isFile If the given file exists
+   */
+  type readFileCallback = (err: Error, file?: Buffer) => void;
+
+  /**
+   * Asynchronously resolve the module path string id into cb(err, res [, pkg]), where pkg (if defined) is the data from package.json
+   *
+   * @param id Identifier to resolve
+   * @param callback
+   */
+  function resolve(id: string, cb: resolveCallback): void;
+
+  /**
+   * Asynchronously resolve the module path string id into cb(err, res [, pkg]), where pkg (if defined) is the data from package.json
+   *
+   * @param id Identifier to resolve
+   * @param options Options to use for resolving, optional.
+   * @param callback
+   */
+  function resolve(id: string, opts: resolve.AsyncOpts, cb: resolveCallback): void;
+
+  /**
+   * Synchronously resolve the module path string id, returning the result and throwing an error when id can't be resolved.
+   *
+   * @param id Identifier to resolve
+   * @param options Options to use for resolving, optional.
+   */
+  function resolveSync(id: string, opts?: resolve.SyncOpts): string;
+
+  /**
+   * Return whether a package is in core
+   *
+   * @param id
+   */
+  function resolveIsCore(id: string): boolean;
+
+  namespace resolve {
+    interface Opts {
+      // directory to begin resolving from (defaults to __dirname)
+      basedir?: string;
+      // package.json data applicable to the module being loaded
+      package?: any;
+      // array of file extensions to search in order (defaults to ['.js'])
+      extensions?: string|string[];
+      // transform the parsed package.json contents before looking at the "main" field
+      packageFilter?: (pkg: any, pkgfile: string) => any;
+      // transform a path within a package
+      pathFilter?: (pkg: any, path: string, relativePath: string) => string;
+      // require.paths array to use if nothing is found on the normal node_modules recursive walk (probably don't use this)
+      paths?: string|string[];
+      // directory (or directories) in which to recursively look for modules. (default to 'node_modules')
+      moduleDirectory?: string|string[]
+    }
+    
+    export interface AsyncOpts extends Opts {
+      // how to read files asynchronously (defaults to fs.readFile)
+      readFile?: (file: string, cb: readFileCallback) => void;
+      // function to asynchronously test whether a file exists
+      isFile?: (file: string, cb: isFileCallback) => void;
+    }
+
+    export interface SyncOpts extends Opts {
+      // how to read files synchronously (defaults to fs.readFileSync)
+      readFileSync?: (file: string) => Buffer;
+      // function to synchronously test whether a file exists
+      isFile?: (file: string) => boolean;
+    }
+
+    export var sync: typeof resolveSync;
+    export var isCore: typeof resolveIsCore;
+  }
+  
+  export = resolve;
+}
diff --git a/seneca/seneca-tests.ts b/seneca/seneca-tests.ts
new file mode 100644
index 0000000000..9bc411525f
--- /dev/null
+++ b/seneca/seneca-tests.ts
@@ -0,0 +1,131 @@
+/// <reference path='../node/node.d.ts' />
+/// <reference path='seneca.d.ts' />
+
+/*
+* This file contains all of the example code that was on http://senecajs.org as of Mon June 16, 2016.
+*/
+
+import SENECA = require('seneca')
+var seneca = SENECA()
+
+seneca.add({ cmd: 'salestax' }, function (args, callback) {
+  var rate  = 0.23
+  var total = args.net * (1 + rate)
+  callback(null, { total: total })
+})
+
+seneca.act({ cmd: 'salestax', net: 100 }, function (err, result) {
+  console.log(result.total)
+})
+
+
+
+seneca.add({ cmd: 'config' }, function (args, callback) {
+  var config: any = {     // any added here due to following config[] access
+    rate: 0.23
+  }
+  var value = config[args.prop]
+  callback(null, { value: value })
+})
+
+seneca.add({ cmd: 'salestax' }, function (args, callback) {
+  seneca.act({ cmd: 'config', prop: 'rate' }, function (err, result) {
+    var rate  = parseFloat(result.value)
+    var total = args.net * (1 + rate)
+    callback(null, { total: total })
+  })
+})
+
+seneca.act({ cmd: 'salestax', net: 100 }, function (err, result) {
+  console.log(result.total)
+})
+
+
+
+
+seneca.act('cmd:salestax,net:100', function (err, result) {
+  console.log(result.total)
+})
+
+
+
+
+seneca.act('cmd:salestax', { net: 100 }, function (err, result) {
+  console.log(result.total)
+})
+
+
+
+seneca.add({ cmd: 'config' }, function (args, callback) {
+    var config: any = {     // any added here due to following config[] access
+    rate: 0.23
+  }
+  var value = config[args.prop]
+  callback(null, { value: value })
+})
+
+seneca.listen()
+
+
+
+seneca.add({ cmd: 'salestax' }, function (args, callback) {
+  seneca.act({cmd: 'config', prop: 'rate' }, function (err, result) {
+    var rate  = parseFloat(result.value)
+    var total = args.net * (1 + rate)
+    callback(null, { total: total })
+  })
+})
+
+seneca.client()
+
+seneca.act('cmd:salestax,net:100', function (err, result) {
+  console.log(result.total)
+})
+
+
+
+// fixed rate
+seneca.add({ cmd: 'salestax' }, function (args, callback) {
+  var rate  = 0.23
+  var total = args.net * (1 + rate)
+  callback(null, { total: total })
+})
+
+
+// local rates
+seneca.add({ cmd: 'salestax', country: 'US' }, function (args, callback) {
+  var state: any = {     // any added here due to following state[] access
+    'NY': 0.04,
+    'CA': 0.0625
+    // ...
+  }
+  var rate = state[args.state]
+  var total = args.net * (1 + rate)
+  callback(null, { total: total })
+})
+
+
+// categories
+seneca.add({ cmd: 'salestax', country: 'IE' }, function (args, callback) {
+  var category: any = {     // any added here due to following category[] access
+    'top': 0.23,
+    'reduced': 0.135
+    // ...
+  }
+  var rate = category[args.category]
+  var total = args.net * (1 + rate)
+  callback(null, { total: total })
+})
+
+
+seneca.act('cmd:salestax,net:100,country:DE', function (err, result) {
+  console.log('DE: ' + result.total)
+})
+
+seneca.act('cmd:salestax,net:100,country:US,state:NY', function (err, result) {
+  console.log('US,NY: ' + result.total)
+})
+
+seneca.act('cmd:salestax,net:100,country:IE,category:reduced', function (err, result) {
+  console.log('IE: ' + result.total)
+})
diff --git a/seneca/seneca.d.ts b/seneca/seneca.d.ts
new file mode 100644
index 0000000000..08fd71859d
--- /dev/null
+++ b/seneca/seneca.d.ts
@@ -0,0 +1,231 @@
+// Type definitions for seneca v2.1.0
+// Project: https://www.npmjs.com/package/seneca
+// Definitions by: Peter Snider <https://github.com/psnider/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/seneca
+
+
+declare module "seneca" {
+
+    type UnknownType = any;
+
+
+    // function s(options?: Options): Seneca;
+
+
+    // what does seneca do about logging?
+    function log(): void;
+
+
+    // module s {
+
+        interface Options {
+            [plugin_name: string]: any;
+            tag?: string;
+            // Standard length of identifiers for actions.
+            idlen?: number;
+            // Standard timeout for actions.
+            timeout?: number;   // milliseconds
+            // Register (true) default plugins. Set false to not register when
+            // using custom versions.
+            default_plugins?: {
+                basic?:       boolean;
+                'mem-store'?: boolean;
+                transport?:   boolean;
+                web?:         boolean;
+            };
+            // Settings for network REPL.
+            repl?: {
+                port?: number;
+                host?: string;
+            };
+            // Debug settings.
+            debug?: {
+                // Throw (some) errors from seneca.act.
+                fragile?:    boolean;
+                // Fatal errors ... aren't fatal. Not for production!
+                undead?:     boolean;
+                // Print debug info to console
+                print?: {
+                    // Print options. Best used via --seneca.print.options.
+                    options?: boolean;
+                };
+                // Trace action caller and place in args.caller$.
+                act_caller?: boolean;
+                // Shorten all identifiers to 2 characters.
+                short_logs?: boolean;
+                // Record and log callpoints (calling code locations).
+                callpoint?: boolean;
+            };
+            // Enforce strict behaviours. Relax when backwards compatibility needed.
+            strict?: {
+                // Action result must be a plain object.
+                result?: boolean;
+                // Delegate fixedargs override action args.
+                fixedargs?: boolean;
+                // Adding a pattern overrides existing pattern only if matches exactly.
+                add?: boolean;
+            };
+            // Action cache. Makes inbound messages idempotent.
+            actcache?: {
+                active?: boolean;
+                size?:   number;
+            };
+            // Action executor tracing. See gate-executor module.
+            trace?: {
+                act?: boolean;
+                stack?: boolean;
+                unknown?: string;
+            },
+            // Action statistics settings. See rolling-stats module.
+            stats?: {
+                size?: number;
+                interval?: number;
+                running?: boolean;
+            };
+            // Wait time for plugins to close gracefully.
+            deathdelay?: number;
+            // Default seneca-admin settings.
+            // TODO: move to seneca-admin!
+            admin?: {
+                local?: boolean;
+                prefix?: string;
+            };
+            // Plugin settings
+            plugin?: any;
+            // Internal settings.
+            internal?: {
+                // Close instance on these signals, if true.
+                close_signals?: {
+                    SIGHUP?: boolean;
+                    SIGTERM?: boolean;
+                    SIGINT?: boolean;
+                    SIGBREAK?: boolean;
+                };
+                actrouter?: UnknownType;
+                clientrouter?: UnknownType;
+                subrouter?: UnknownType;
+            };
+            // Log status at periodic intervals.
+            status?: {
+                interval?: number;
+                // By default, does not run.
+                running?: boolean;
+            },
+            // zig module settings for seneca.start() chaining.
+            zig?: any;
+            log?: {
+                short?: boolean;
+            };
+            errhandler?: GlobalErrorHandler;
+        }
+
+        interface MinimalPattern {
+            //role?: string;
+            //cmd?: string;
+        }
+
+        interface Optioner {
+          set: (input: string | Options) => Options;
+          get: () => Options;
+        }
+
+        type ExecutorWorker = (callback: any) => void;
+        type ExecutorCallback = (err: Error, result: any) => void;
+        interface Executor {
+            id: string;
+            desc: string;
+            fn: ExecutorWorker;
+            cb: ExecutorCallback;
+            gate: boolean;
+            ungate: boolean;
+            execute: UnknownType;
+        }
+
+        interface PluginOptions {
+        }
+        type PluginModule = (options: any) => void;
+
+        interface ClientOptions {
+        }
+
+        interface ListenOptions {
+        }
+
+        interface EntityDataWithQuery {
+            [entityKey: string]: any;
+            id?: string;
+            sort$?: any;
+        }
+
+
+
+        type Pattern = string | MinimalPattern;
+        type GlobalErrorHandler = (error: Error) => void;
+        type AddCallback = (msg: any, respond: (error: Error, msg: any) => void) => void;
+        type ActCallback = (error: Error, result: any) => void;
+        type CloseCallback = (optional: any, done: (error: Error) => void) => void;
+        type DatabaseID = string;
+        type EntitySaveCallback = (error: Error, result: any) => void;
+        type EntityLoadCallback = (error: Error, result: any) => void;
+        type EntityRemoveCallback = (error: Error) => void;
+        type EntityListCallback = (error: Error, result: any[]) => void;
+
+
+        interface Seneca {
+            version: string;
+
+            (options?: Options): Seneca;
+            options(options: Options): void;
+
+            error(handler: GlobalErrorHandler): void;
+            on(eventName: string, callback: (error: Error) => void): any;
+            close(callback: CloseCallback): void;
+            use(module: PluginModule, options?: PluginOptions): this;
+            use(name: string, options?: PluginOptions): this;
+            client(options?: ClientOptions): this;
+            listen(options?: ListenOptions): this;
+
+            ready(callback: (error: Error) => void): void;
+
+            add(pattern: Pattern, action: AddCallback): this;
+            add(pattern: Pattern, paramspec: any, action: AddCallback): this;
+            act(pattern: Pattern, respond: ActCallback): void;
+            act(pattern: Pattern, msg: any, respond: ActCallback): void;
+            make(entity_canon: string, properties?: any): Entity;
+            make(base: string, entity_canon: string, properties?: any): Entity;
+            make(zone: string, base: string, entity_canon: string, properties?: any): Entity;
+
+            // @param name reference to plugin provided object
+            export(name: string): void;
+
+            pin(pattern: Pattern): void;
+        }
+
+
+        // NOTE: senecas documented use of:
+        //    var product = seneca.make('product')
+        //    product.name = 'Apple'
+        // causes this error: error TS2339: Property 'name' does not exist on type 'Entity'.
+        // Change such references to: product['name']
+        interface Entity {
+            (canon: any, seneca: any): void;
+            [fieldname: string]: any;
+            // there appear to be many more variants of make$(), but its unclear that they are intended for the public API
+            make$(): Entity;
+            make$(name: string): Entity;
+            make$(base: string, name: string): Entity;
+            make$(zone: string, base: string, name: string): Entity;
+
+            save$(callback: EntitySaveCallback): void;
+            save$(props: EntityDataWithQuery, callback: EntitySaveCallback): void;
+            load$(id: DatabaseID | EntityDataWithQuery, callback: EntityLoadCallback): void;
+            remove$(id: DatabaseID | EntityDataWithQuery, callback: EntityRemoveCallback): void;
+            list$(query: EntityDataWithQuery, callback: EntityListCallback): void;
+        }
+
+    // }
+
+    var sen: Seneca
+    export = sen;
+
+}
diff --git a/simplestorage.js/simplestorage.js-tests.ts b/simplestorage.js/simplestorage.js-tests.ts
index 1e9f4202a3..4106c88001 100644
--- a/simplestorage.js/simplestorage.js-tests.ts
+++ b/simplestorage.js/simplestorage.js-tests.ts
@@ -1,17 +1,18 @@
 ///<reference path="simplestorage.js.d.ts"/>
 
-var versionTest:        string           = simpleStorage.version;
-var canUseTest:         boolean          = simpleStorage.canUse();
-var simpleStorageTest1: boolean|Error    = simpleStorage.set("string", 7);
-var simpleStorageTest2: boolean|Error    = simpleStorage.set("string", 7, {});
-var simpleStorageTest3: boolean|Error    = simpleStorage.set("string", 7, { TTL: 7 });
-var simpleStorageTest4: boolean|Error    = simpleStorage.set("string", undefined);
-var simpleStorageTest5: boolean|Error    = simpleStorage.set("string", undefined, {});
-var simpleStorageTest6: boolean|Error    = simpleStorage.set("string", undefined, { TTL: 7 });
-var getTest:            any              = simpleStorage.get("string");
-var deleteKeyTest:      boolean|Error    = simpleStorage.deleteKey("string");
-var setTTLTest:         boolean|Error    = simpleStorage.setTTL("string", 7);
-var getTTLTest:         number|boolean   = simpleStorage.getTTL("string");
-var flushTest:          boolean|Error    = simpleStorage.flush();
-var indexTest:          [string]|boolean = simpleStorage.index();
-var storageSizeTest:    number           = simpleStorage.storageSize();
+var versionTest: string = simpleStorage.version;
+var canUseTest: boolean = simpleStorage.canUse();
+var simpleStorageTest1: boolean|Error = simpleStorage.set("string", 7);
+var simpleStorageTest2: boolean|Error = simpleStorage.set("string", 7, {});
+var simpleStorageTest3: boolean|Error = simpleStorage.set("string", 7, {TTL: 7});
+var simpleStorageTest4: boolean|Error = simpleStorage.set("string", undefined);
+var simpleStorageTest5: boolean|Error = simpleStorage.set("string", undefined, {});
+var simpleStorageTest6: boolean|Error = simpleStorage.set("string", undefined, {TTL: 7});
+var getTest: any = simpleStorage.get("string");
+var deleteKeyTest: boolean|Error = simpleStorage.deleteKey("string");
+var setTTLTest: boolean|Error = simpleStorage.setTTL("string", 7);
+var getTTLTest: number|boolean = simpleStorage.getTTL("string");
+var flushTest: boolean|Error = simpleStorage.flush();
+var indexTest: [string]|boolean = simpleStorage.index();
+var storageSizeTest: number = simpleStorage.storageSize();
+var hasKey: boolean = simpleStorage.hasKey("string");
diff --git a/simplestorage.js/simplestorage.js.d.ts b/simplestorage.js/simplestorage.js.d.ts
index 43650fd657..9e02f1b454 100644
--- a/simplestorage.js/simplestorage.js.d.ts
+++ b/simplestorage.js/simplestorage.js.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for simpleStorage v0.1.3
+// Type definitions for simplestorage.js v0.2.1
 // Project: https://github.com/andris9/simpleStorage
-// Definitions by: Áxel Costas Pena <https://github.com/axelcostaspena>
+// Definitions by: Áxel Costas Pena <https://github.com/axelcostaspena>, Michael Ledin <https://github.com/mxl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace simplestoragejs {
@@ -38,6 +38,14 @@ declare namespace simplestoragejs {
          */
         get(key: string): any;
 
+        /**
+         * Checks if there's a value with the given key in the local storage.
+         * Returns <code>true</code> if the given key exists, <code>false</code> otherwise.
+         * @param key The key to be checked.
+         * @see https://github.com/andris9/simpleStorage#haskeykey
+         */
+        hasKey(key: string): boolean;
+
         /**
          * Removes a value from local storage.
          * Returns <code>true</code> if the value was deleted, <code>false</code> if the value was not found or <code>{@link Error}</code> object if value was not deleted because of an error.
@@ -96,7 +104,7 @@ declare namespace simplestoragejs {
 
 }
 
-declare module "simpleStorage" {
+declare module "simplestorage.js" {
     export = simpleStorage;
 }
 
@@ -107,4 +115,4 @@ declare module "simpleStorage" {
  * {@link simpleStorage} is very small - about 1kB in size when minimized and gzipped.
  * @see https://github.com/andris9/simpleStorage#simplestorage
  */
-declare var simpleStorage:simplestoragejs.SimpleStorage;
+declare var simpleStorage: simplestoragejs.SimpleStorage;
diff --git a/sinon-as-promised/sinon-as-promised-tests.ts b/sinon-as-promised/sinon-as-promised-tests.ts
new file mode 100644
index 0000000000..97ff6aaa3c
--- /dev/null
+++ b/sinon-as-promised/sinon-as-promised-tests.ts
@@ -0,0 +1,11 @@
+/// <reference path="sinon-as-promised.d.ts"/>
+function testResolve() {
+    sinon.stub().resolves('test val');
+}
+
+function testReject() {
+    sinon.stub().rejects('test val');
+}
+
+testResolve();
+testReject();
diff --git a/sinon-as-promised/sinon-as-promised.d.ts b/sinon-as-promised/sinon-as-promised.d.ts
new file mode 100644
index 0000000000..3a214ea254
--- /dev/null
+++ b/sinon-as-promised/sinon-as-promised.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for sinon-as-promised v4.0.0
+// Project: https://github.com/bendrucker/sinon-as-promised
+// Definitions by: igrayson <https://github.com/igrayson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../sinon/sinon.d.ts"/>
+
+declare namespace Sinon {
+
+  export interface SinonStub {
+
+    /**
+     * When called, the stub will return a "thenable" object which will return a promise for the provided value. Any Promises/A+ compliant library will handle this object properly.
+     */
+    resolves(value:any):SinonStub;
+
+    /**
+     * When called, the stub will return a thenable which will return a reject promise with the provided err. If err is a string, it will be set as the message on an Error object.
+     */
+    rejects(err:any):SinonStub;
+  } 
+
+}
diff --git a/split2/split2-tests.ts b/split2/split2-tests.ts
new file mode 100644
index 0000000000..2e09612c3b
--- /dev/null
+++ b/split2/split2-tests.ts
@@ -0,0 +1,31 @@
+/// <reference path="./split2.d.ts" />
+/// <reference path="../node/node.d.ts" />
+import * as split from 'split2';
+import * as fs from 'fs';
+import { Transform, TransformOptions } from 'stream';
+
+let stream: Transform;
+let options: split.Options = {};
+let matcherString = '\t';
+let matcherRegex = /\r?\n/;
+
+stream = split();
+stream = split(JSON.parse);
+stream = split(options);
+stream = split(JSON.parse, options);
+stream = split(matcherString);
+stream = split(matcherString, JSON.parse);
+stream = split(matcherString, options);
+stream = split(matcherString, JSON.parse, options);
+stream = split(matcherRegex);
+stream = split(matcherRegex, JSON.parse);
+stream = split(matcherRegex, options);
+stream = split(matcherRegex, JSON.parse, options);
+
+options = {
+  maxLength: 1000,
+  objectMode: true,
+  highWaterMark: 16,
+  encoding: 'utf8'
+};
+
diff --git a/split2/split2.d.ts b/split2/split2.d.ts
new file mode 100644
index 0000000000..4ba12ae478
--- /dev/null
+++ b/split2/split2.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for split2 2.1.0
+// Project: https://github.com/mcollina/split2
+// Definitions by: TANAKA Koichi <https://github.com/mugeso/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+declare module "split2" {
+    import { Transform, TransformOptions } from 'stream';
+
+    type Matcher = string|RegExp;
+    type Mapper = split.Mapper;
+    type Options = split.Options;
+
+    function split(): Transform;
+    function split(matcher: Matcher): Transform;
+    function split(mapper: Mapper): Transform;
+    function split(options: Options): Transform;
+    function split(matcher: Matcher, mapper: Mapper): Transform;
+    function split(matcher: Matcher, options: Options): Transform;
+    function split(mapper: Mapper, options: Options): Transform;
+    function split(matcher: Matcher, mapper: Mapper, options: Options): Transform;
+
+    namespace split {
+        export interface Mapper {
+            (line: string): any;
+        }
+
+        export interface Options extends TransformOptions {
+           maxLength?: number;
+        }
+    }
+
+    export = split;
+}
diff --git a/striptags/striptags-tests.ts b/striptags/striptags-tests.ts
new file mode 100644
index 0000000000..e7517cf05d
--- /dev/null
+++ b/striptags/striptags-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="./striptags.d.ts" />
+import striptags from 'striptags';
+
+    function testStriptags() {
+    var html =
+        '<a href="https://example.com">' +
+            'lorem ipsum <strong>dolor</strong> <em>sit</em> amet' +
+        '</a>';
+
+    striptags(html);
+    striptags(html, '<a><strong>');
+    striptags(html, ['a']);
+}
\ No newline at end of file
diff --git a/striptags/striptags.d.ts b/striptags/striptags.d.ts
new file mode 100644
index 0000000000..dfbf79adc1
--- /dev/null
+++ b/striptags/striptags.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for striptags
+// Project: https://github.com/ericnorris/striptags
+// Definitions by: Craig Citro <https://github.com/ccitro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'striptags' {
+    export default function strip (html: string, allowedTags?: string | string[]): string;
+}
diff --git a/systemjs/systemjs.d.ts b/systemjs/systemjs.d.ts
index a04ee7a90d..3a71669041 100644
--- a/systemjs/systemjs.d.ts
+++ b/systemjs/systemjs.d.ts
@@ -119,7 +119,7 @@ declare namespace SystemJSLoader {
          * The default extension to add to modules requested within the package. Takes preference over defaultJSExtensions.
          * Can be set to defaultExtension: false to optionally opt-out of extension-adding when defaultJSExtensions is enabled.
          */
-        defaultExtension?: boolean;
+        defaultExtension?: boolean | string;
 
         /**
          * Local and relative map configurations scoped to the package. Apply for subpaths as well.
diff --git a/title/title-tests.ts b/title/title-tests.ts
new file mode 100644
index 0000000000..7a96ceed02
--- /dev/null
+++ b/title/title-tests.ts
@@ -0,0 +1,10 @@
+/// <reference path="./title.d.ts"/>
+import title = require("title");
+
+var document = {title: "original"};
+
+title("newtitle"); // document.title === 'newtitle'
+
+title("%s - %o", "new"); // document.title === 'new - original'
+
+title.reset(); // document.title === 'original'
diff --git a/title/title.d.ts b/title/title.d.ts
new file mode 100644
index 0000000000..19982aa3fb
--- /dev/null
+++ b/title/title.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for title v1.0.0
+// Project: https://www.npmjs.com/package/title
+// Definitions by: Fahad <https://github.com/fa7ad>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "title"{
+    function Title(newtitle: string): void;
+    function Title(pattern: string, newtitle?: string): void;
+    namespace Title {
+        function reset(): void;
+    }
+
+    export = Title;
+}
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
index 695be8f908..a598bc9846 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -926,6 +926,12 @@ declare namespace uiGrid {
          *        us which refreshes to fire.
          */
         notifyDataChange(type: string): void;
+        /**
+         * Refresh the rendered grid on screen.
+         *
+         * @param {boolean} [rowsAltered] Optional flag for refreshing when the number of rows has changed.
+         */
+        refresh(rowsAltered?: boolean): ng.IPromise<any>;
         /**
          * Refresh the rendered rows on screen?  Note: not functional at present
          * @returns {ng.IPromise<any>} promise that is resolved when render completes?
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index 1986786629..fb7ff79437 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -3511,10 +3511,10 @@ interface UnderscoreStatic {
 
 	/**
 	* Returns a negated version of the pass-in predicate.
-	* @param Function predicate
-	* @return boolean
+	* @param (...args: any[]) => boolean predicate
+	* @return (...args: any[]) => boolean
 	**/
-	negate(predicate: Function): boolean;
+	negate(predicate: (...args: any[]) => boolean): (...args: any[]) => boolean;
 
 	/**
 	* Returns the composition of a list of functions, where each function consumes the return value of the
diff --git a/wampy/wampy-tests.ts b/wampy/wampy-tests.ts
index f7dcf9fe52..c0ac8d6656 100644
--- a/wampy/wampy-tests.ts
+++ b/wampy/wampy-tests.ts
@@ -13,7 +13,8 @@ ws.options({
     onConnect: function () { console.log('Yahoo! We are online!'); },
     onClose: function () { console.log('See you next time!'); },
     onError: function () { console.log('Breakdown happened'); },
-    onReconnect: function () { console.log('Reconnecting...'); }
+    onReconnect: function () { console.log('Reconnecting...'); },
+    onReconnectSuccess: function () { console.log('Successfully reconnected!'); }
 });
 
 ws.connect();
@@ -93,7 +94,7 @@ var status = ws.getOpStatus();
 
 ws.cancel(status.reqId);
 
-var sqrt_f = function (x: number) { return x*x; };
+var sqrt_f = function (x: number, y: any) { return [{}, x*x]; };
 
 ws.register('sqrt.value', sqrt_f);
 
diff --git a/wampy/wampy.d.ts b/wampy/wampy.d.ts
index 650a8a91a5..e068b97a25 100644
--- a/wampy/wampy.d.ts
+++ b/wampy/wampy.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for wampy.js v2.0.1
+// Type definitions for wampy.js v3.0.x
 // Project: https://github.com/KSDaemon/wampy.js
 // Definitions by: Konstantin Burkalev <https://github.com/KSDaemon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,10 +12,13 @@ declare module "wampy" {
         transportEncoding?: string;
         realm?: string;
         helloCustomDetails?: any;
+        onChallenge?: (auth_method: string, challenge_details: string) => string;
+        authid?: string;
         onConnect?: () => void;
         onClose?: () => void;
         onError?: () => void;
         onReconnect?: () => void;
+        onReconnectSuccess?: () => void;
         ws?: any;
         msgpackCoder?: any;
     }
@@ -36,7 +39,7 @@ declare module "wampy" {
     }
 
     interface RegisterCallbacksHash extends SuccessErrorCallbacksHash {
-        rpc: (data: any) => any;
+        rpc: (data: any, options: any) => any[];
     }
 
     interface CallSuccessErrorCallbacksHash {
@@ -51,8 +54,17 @@ declare module "wampy" {
         disclose_me?: boolean;
     }
 
-    interface CallAdvancedOptions extends AdvancedOptions {
+    interface PublishAdvancedOptions extends AdvancedOptions {
+        exclude_authid?: string | string[];
+        exclude_authrole?: string | string[];
+        eligible_authid?: string | string[];
+        eligible_authrole?: string | string[];
+    }
+
+    interface CallAdvancedOptions {
+        disclose_me?: boolean;
         receive_progress?: boolean;
+        timeout?: number;
     }
 
     interface CancelAdvancedOptions {
@@ -71,7 +83,7 @@ declare module "wampy" {
         publish(topicURI: string,
                 payload?: any,
                 callbacks?: SuccessErrorCallbacksHash,
-                advancedOptions?: AdvancedOptions): Wampy;
+                advancedOptions?: PublishAdvancedOptions): Wampy;
         call(topicURI: string,
              payload?: any,
              callbacks?: (((data: any) => void) | CallSuccessErrorCallbacksHash),
@@ -79,7 +91,7 @@ declare module "wampy" {
         cancel(reqId: number,
                callbacks?: ((() => void) | SuccessErrorCallbacksHash),
                advancedOptions?: CancelAdvancedOptions): Wampy;
-        register(topicURI: string, callbacks: (((data: any) => any) | RegisterCallbacksHash)): Wampy;
+        register(topicURI: string, callbacks: (((data: any, options: any) => any[]) | RegisterCallbacksHash)): Wampy;
         unregister(topicURI: string, callbacks?: ((() => void) | SuccessErrorCallbacksHash)): Wampy;
     }
 
diff --git a/webix/webix-2.3.0.d.ts b/webix/webix-2.3.0.d.ts
deleted file mode 100644
index a168406892..0000000000
--- a/webix/webix-2.3.0.d.ts
+++ /dev/null
@@ -1,7533 +0,0 @@
-// Type definitions for Webix UI v2.3.0
-// Project: http://webix.com
-// Definitions by: Maksim Kozhukh <http://github.com/mkozhukh>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace webix {
-
-type WebixTemplate = (...args: any[])=>string;
-type WebixCallback = (...args: any[])=>any;
-interface PromisedData {
-    then(handler:(data:any)=>any):PromisedData;
-}
-
-function ajax():webix._ajax;
-function $$(id: string|Event|HTMLElement):webix.ui.view;
-
-
-interface _ajax{
-	bind(master:any):webix._ajax;
-	del(url:string, params?:any, callback?:WebixCallback):PromisedData;
-	get(url:string, params?:any, callback?:WebixCallback):PromisedData;
-	getXHR():any;
-	headers(values:any):webix._ajax;
-	post(url:string, params?:any, callback?:WebixCallback):PromisedData;
-	put(url:string, params?:any, callback?:WebixCallback):PromisedData;
-	response(type:string):void;
-	stringify():void;
-	sync():webix._ajax;
-	master: any;
-}
-interface clipbuffer{
-	destructor():void;
-	focus():void;
-	init():void;
-	set(text:string):void;
-}
-interface color{
-	hexToDec(hex:string):number;
-	hsvToRgb(h:number, s:number, v:number):any[];
-	rgbToHsv(r:number, g:number, b:number):any[];
-	toHex(number:number, length?:number):string;
-	toRgb(rgb:string):any[];
-}
-interface csv{
-	parse(text:string, delimiter?:any):any[];
-	stringify(data:any[], delimiter?:any):string;
-	delimiter: any;
-	escape: boolean;
-}
-interface editors{
-	$popup: any;
-	checkbox: string;
-	color: string;
-	combo: string;
-	date: string;
-	"inline-checkbox": any;
-	"inline-text": any;
-	multiselect: string;
-	password: string;
-	popup: string;
-	richselect: string;
-	select: string;
-	text: string;
-}
-interface env{
-	cssPrefix: string;
-	isFF: boolean;
-	isIE: boolean;
-	isSafari: boolean;
-	isWebKit: boolean;
-	jsPrefix: string;
-	mouse: any;
-	strict: boolean;
-	svg: boolean;
-	transform: boolean;
-	transition: boolean;
-	transitionDuration: string;
-	transitionEnd: string;
-	translate: string;
-}
-interface history{
-	push(view:string, url:string, value:any):void;
-	track(view:string, url:string):void;
-}
-interface html{
-	addCss(node:HTMLElement, name:string):void;
-	addMeta(name:string, value:string):void;
-	addStyle(css:string):void;
-	allowSelect():void;
-	create(name:string, attrs:any, html?:string):HTMLElement;
-	createCss(data:any):string;
-	denySelect():void;
-	getValue(node:HTMLElement):string;
-	index(node:HTMLElement):number;
-	insertBefore(node:HTMLElement, before:HTMLElement, rescue?:HTMLElement):void;
-	locate(ev:Event|HTMLElement, name:string):string;
-	offset(node:HTMLElement):any;
-	pos(ev:Event):any;
-	posRelative(ev:Event):any;
-	preventEvent(ev:Event):boolean;
-	remove(node:HTMLElement|HTMLElement[]):void;
-	removeCss(node:HTMLElement, name:string):void;
-	stopEvent(ev:Event):boolean;
-}
-interface i18n{
-	dateFormatDate(date:string):any;
-	dateFormatStr(date:any):string;
-	fullDateFormatDate(date:string):any;
-	fullDateFormatStr(date:Date):string;
-	intFormat(num:number):string;
-	longDateFormatDate(date:string):any;
-	longDateFormatStr(date:any):string;
-	numberFormat(number:number):string;
-	parseFormatDate(date:string):any;
-	parseFormatStr(date:any):string;
-	parseTimeFormatDate(date:string):void;
-	parseTimeFormatStr(date:any):void;
-	priceFormat(number:number):string;
-	setLocale(name:string):void;
-	timeFormatDate(time:string):any;
-	timeFormatStr(date:any):string;
-	calendar: any;
-	controls: any;
-	dateFormat: string;
-	decimalDelimiter: string;
-	decimalSize: number;
-	fileSize: any[];
-	fullDateFormat: string;
-	groupDelimiter: string;
-	groupSize: number;
-	locales: any;
-	longDateFormat: string;
-	parseFormat: string;
-	parseTimeFormat: string;
-	price: string;
-	priceSettings: any;
-	timeFormat: string;
-}
-interface locale{
-	pager: any;
-}
-interface markup{
-	init(node:string, target:string):webix.ui.baseview;
-	parse(data:any, datatype:string):void;
-	attribute: any;
-	dataTag: any;
-	namespace: any;
-}
-interface promise{
-	all(promise:PromisedData, morepromises?:PromisedData):void;
-	defer():PromisedData;
-	fcall():PromisedData;
-	nfcall():PromisedData;
-}
-interface rules{
-	isEmail():void;
-	isNotEmpty():void;
-	isNumber():void;
-}
-interface cookie{
-	clear():void;
-	get(name:string):any;
-	put(name:string, value:any):void;
-	remove(name:string):void;
-}
-interface local{
-	clear():void;
-	get(name:string):any;
-	put(name:string, value:any):void;
-	remove(name:string):void;
-}
-interface session{
-	clear():void;
-	get(name:string):any;
-	put(name:string, value:any):void;
-	remove(name:string):void;
-}
-interface storage{
-	cookie:webix.cookie;
-	local:webix.local;
-	session:webix.session;
-}
-
-function alert(text:string, callback:WebixCallback):HTMLElement;
-function animate(html_element:HTMLElement, animation:any):void;
-function attachEvent(type:string, functor:WebixCallback, id?:string):string;
-function bind(code:WebixCallback, master:any):WebixCallback;
-function blockEvent():void;
-function callEvent(name:string, params:any[]):boolean;
-function clone(source:any):any;
-function confirm(text:string, callback:WebixCallback):HTMLElement;
-function copy(source:any):any;
-function delay(code:WebixCallback, owner?:any, params?:any[], delay?:number):number;
-function detachEvent(id:string):void;
-function dp(name:string):any;
-function editStop():void;
-function event(node:HTMLElement, event:string, handler:WebixCallback, master?:any):string;
-function eventRemove(id:string):void;
-function exec(code:string):void;
-function extend(target:any, source:any, overwrite:boolean):any;
-function hasEvent(name:string):boolean;
-function isArray(check:any):boolean;
-function isDate(check:any):boolean;
-function isUndefined(check:any):boolean;
-function jsonp(url:string, params?:any, callback?:WebixCallback, master?:any):void;
-function mapEvent(map:any):void;
-function message(text:string):void;
-function modalbox(text:string, callback:WebixCallback):HTMLElement;
-function once(code:WebixCallback):void;
-function proto(target:any, mixin1?:any, mixinN?:any):any;
-function protoUI(target:any, view:any, mixin1?:any, mixinN?:any):any;
-function proxy(type:string, source:string):any;
-function ready(code:WebixCallback):void;
-function remote():void;
-function require(url:string):void;
-function send(url:string, values:any, method:string, target:string):void;
-function single(source:WebixCallback):WebixCallback;
-function template(template:string):WebixCallback;
-function toArray(array:any[]):any[];
-function toFunctor(name:string):WebixCallback;
-function toNode(id:string):HTMLElement;
-function type(config:any):void;
-function ui(config:any, parent?:any, replacement?:any):webix.ui.baseview;
-function uid():string;
-function unblockEvent():void;
-function wrap(target:WebixCallback, source:WebixCallback):WebixCallback;
-var codebase: string;
-var name: string;
-var version: string;
-var clipbuffer:webix.clipbuffer;
-var color:webix.color;
-var csv:webix.csv;
-var editors:webix.editors;
-var env:webix.env;
-var history:webix.history;
-var html:webix.html;
-var i18n:webix.i18n;
-var locale:webix.locale;
-var markup:webix.markup;
-var promise:webix.promise;
-var rules:webix.rules;
-var storage:webix.storage;
-
-interface ActiveContent{
-	}
-var ActiveContent:ActiveContent;
-
-interface AtomDataLoader{
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	parse(data:any, type:string):void;
-}
-var AtomDataLoader:AtomDataLoader;
-
-interface AtomRender{
-	render(id:string, data:any, type:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-}
-var AtomRender:AtomRender;
-
-interface AutoTooltip{
-	}
-var AutoTooltip:AutoTooltip;
-
-interface BaseBind{
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	unbind():void;
-}
-var BaseBind:BaseBind;
-
-interface BindSource{
-	addBind(source:any, rule:string, format:string):void;
-	getBindData(key:string, update:boolean):void;
-	removeBind(source:any):void;
-	saveBatch(func:WebixCallback):void;
-	setBindData(data:any, key:string):void;
-}
-var BindSource:BindSource;
-
-interface Canvas{
-	clearCanvas():void;
-	getCanvas(context:string):any;
-	hideCanvas():void;
-	renderText(x:number, y:number, text:string, css:string, w:number):void;
-	renderTextAt(valign:string, align:string, x:number, y:number, t:string, c:string, w:number):void;
-	showCanvas():void;
-	toggleCanvas():void;
-}
-var Canvas:Canvas;
-
-interface CollectionBind{
-	getCursor():number;
-	refreshCursor():void;
-	setCursor(cursor:string):void;
-}
-var CollectionBind:CollectionBind;
-
-interface ContextHelper{
-	attachTo(view:any):void;
-	getContext():any;
-}
-var ContextHelper:ContextHelper;
-
-interface CopyPaste{
-	}
-var CopyPaste:CopyPaste;
-
-interface CustomScroll{
-	enable(html_node:HTMLElement|webix.ui.baseview):void;
-	init():void;
-	scrollStep: number;
-}
-var CustomScroll:CustomScroll;
-
-interface DataCollection{
-	add(obj:any, index?:number):string;
-	addBind(source:any, rule:string, format:string):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearValidation():void;
-	count():number;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBindData(key:string, update:boolean):void;
-	getCursor():number;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getPrevId(id:string, step:number):string;
-	hasEvent(name:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	refreshCursor():void;
-	remove(id:string):void;
-	removeBind(source:any):void;
-	saveBatch(func:WebixCallback):void;
-	serialize():any;
-	setBindData(data:any, key:string):void;
-	setCursor(cursor:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	config: { [key: string]: any; };
-	name: string;
-}
-interface DataCollectionFactory{
-	new():DataCollection;
-}
-var DataCollection:DataCollectionFactory;
-
-interface DataDriver{
-	csv: any;
-	html: any;
-	htmltable: any;
-	jsarray: any;
-	json: any;
-	xml: any;
-}
-var DataDriver:DataDriver;
-
-interface DataLoader{
-	add(obj:any, index?:number):string;
-	clearAll():void;
-	count():number;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getPrevId(id:string, step:number):string;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	serialize():any;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	updateItem(id:string, data:any):void;
-}
-var DataLoader:DataLoader;
-
-interface DataMarks{
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	clearCss(css:string, silent?:boolean):void;
-	hasCss(id:string, css:string):boolean;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-}
-var DataMarks:DataMarks;
-
-interface DataMove{
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-}
-var DataMove:DataMove;
-
-interface DataProcessor{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	attachProgress(start:WebixCallback, end:WebixCallback, error:WebixCallback):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearValidation():void;
-	define(property:string, value:any):void;
-	detachEvent(id:string):void;
-	escape(value:string):string;
-	getItemState(itemId:string):any;
-	getState():string|boolean;
-	hasEvent(name:string):boolean;
-	ignore(code:WebixCallback, master:any):void;
-	mapEvent(map:any):void;
-	off():void;
-	on():void;
-	processResult(data:any):void;
-	reset():void;
-	save(id:string, operation:string):void;
-	send():void;
-	setItemState(itemId:string, state:boolean):void;
-	unblockEvent():void;
-	validate():boolean;
-	config: { [key: string]: any; };
-	name: string;
-}
-var DataProcessor:DataProcessor;
-
-interface DataRecord{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	detachEvent(id:string):void;
-	getValues():any;
-	hasEvent(name:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	setValues(values:any, update?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	config: { [key: string]: any; };
-	name: string;
-}
-var DataRecord:DataRecord;
-
-interface DataState{
-	getState():any;
-	setState(state:any):void;
-}
-var DataState:DataState;
-
-interface DataStore{
-	add(obj:any, index?:number):string;
-	addMark(id:string, name:string, css?:boolean, value?:any):any;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	changeId(old:string, newid:string):void;
-	clearAll():void;
-	clearMark(name:string):void;
-	count():number;
-	destructor():void;
-	detachEvent(id:string):void;
-	each(method:WebixCallback, master?:any, all?:boolean):void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getIndexRange(from:string, to:string):any[];
-	getItem(id:string):any;
-	getLastId():string;
-	getMark(id:string, mark_name:string):any;
-	getNextId(id:string, step:number):string;
-	getPrevId(id:string, step:number):string;
-	getRange(from:string, to:string):any[];
-	hasEvent(name:string):boolean;
-	id(item:any):string;
-	importData(source:webix.ui.baseview):void;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	provideApi(target:any, eventable:boolean):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeMark(id:string, name:string, css:boolean):void;
-	scheme(config:any):void;
-	serialize():any;
-	setDriver(type:string):void;
-	silent(code:WebixCallback):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unblockEvent():void;
-	unsync():void;
-	updateItem(id:string, data:any):void;
-	driver: any;
-	name: string;
-	order: any[];
-	pull: any;
-}
-var DataStore:DataStore;
-
-interface DataValue{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	detachEvent(id:string):void;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	setValue(value:string):void;
-	unbind():void;
-	unblockEvent():void;
-	name: string;
-}
-var DataValue:DataValue;
-
-interface Date{
-	add(date:any, inc:number, mode:string):any;
-	copy(date:any):any;
-	datePart(date:any):any;
-	dateToStr(format:string, utc:boolean):WebixCallback;
-	dayStart(date:any):any;
-	equal(datea:any, dateb:any):boolean;
-	getISOWeek(date:any):number;
-	getUTCISOWeek(data:any):number;
-	isHoliday(date:any):boolean;
-	monthStart(date:any):any;
-	strToDate(format:string, utc:boolean):WebixCallback;
-	timePart(date:any):number;
-	toFixed(num:number):number;
-	weekStart(date:any):any;
-	yearStart(date:any):any;
-	startOnMonday: boolean;
-}
-var Date:Date;
-
-interface Destruction{
-	destructor():void;
-}
-var Destruction:Destruction;
-
-interface DragControl{
-	addDrag(node:string|HTMLElement, ctrl:any):void;
-	addDrop(node:string|HTMLElement, ctrl:any, master_mode:boolean):void;
-	createDrag(event:Event):void;
-	destroyDrag():void;
-	getContext():any;
-	getMaster(target:any):any;
-	getNode():HTMLElement;
-	sendSignal(signal:string):void;
-	$drag(s:any, e:Event):HTMLElement;
-	$dragIn(s:any, t:any, e:Event):void;
-	$dragOut(s:any, t:any, n:any, e:Event):void;
-	$dragPos: WebixCallback;
-	$drop(s:any, t:any, d:any, e:Event):void;
-	left: number;
-	top: number;
-}
-var DragControl:DragControl;
-
-interface DragItem{
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-}
-var DragItem:DragItem;
-
-interface DragOrder{
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragPos: WebixCallback;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-}
-var DragOrder:DragOrder;
-
-interface EditAbility{
-	edit(id:any):void;
-	editCancel():void;
-	editNext():boolean;
-	editStop():void;
-	focusEditor():void;
-	getEditState():any;
-	getEditor(id?:string):any;
-	getEditorValue():string;
-	validateEditor(id?:string):boolean;
-}
-var EditAbility:EditAbility;
-
-interface EventSystem{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	detachEvent(id:string):void;
-	hasEvent(name:string):boolean;
-	mapEvent(map:any):void;
-	unblockEvent():void;
-}
-var EventSystem:EventSystem;
-
-interface Group{
-	group(config:any, mode:boolean):void;
-	ungroup(mode:boolean):void;
-}
-var Group:Group;
-
-interface GroupMethods{
-	any(property:string, data:any):void;
-	count(property:string, data:any):void;
-	max(property:string, data:any):void;
-	min(property:string, data:any):void;
-	string(property:string, data:any):void;
-	sum(property:string, data:any):void;
-}
-var GroupMethods:GroupMethods;
-
-interface GroupStore{
-	group(stats:any):void;
-	ungroup():void;
-}
-var GroupStore:GroupStore;
-
-interface HtmlMap{
-	addPoly(id:string, points:any[]):void;
-	addRect(id:string, points:any[], userdata?:string):void;
-	addSector(id:string, aplha0:number, aplha1:number, x:number, y:number, R:number, ky:number):void;
-	render(html:HTMLElement):void;
-}
-var HtmlMap:HtmlMap;
-
-interface IdSpace{
-	innerId(id:string):string;
-	ui(view:any):webix.ui.baseview;
-	$$: any;
-}
-var IdSpace:IdSpace;
-
-interface KeysNavigation{
-	moveSelection(direction:string):void;
-}
-var KeysNavigation:KeysNavigation;
-
-interface MapCollection{
-	}
-var MapCollection:MapCollection;
-
-interface Modality{
-	}
-var Modality:Modality;
-
-interface MouseEvents{
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-}
-var MouseEvents:MouseEvents;
-
-interface Movable{
-	}
-var Movable:Movable;
-
-interface NavigationButtons{
-	}
-var NavigationButtons:NavigationButtons;
-
-interface Number{
-	format(value:number, config:any):string;
-	numToStr(config:any):WebixCallback;
-}
-var Number:Number;
-
-interface OverlayBox{
-	hideOverlay():void;
-	showOverlay():void;
-}
-var OverlayBox:OverlayBox;
-
-interface PagingAbility{
-	getPage():number;
-	getPager():any;
-	setPage(page:number):void;
-}
-var PagingAbility:PagingAbility;
-
-interface PowerArray{
-	each(functor:WebixCallback, master:any):void;
-	filter(functor:WebixCallback, master:any):any[];
-	find(data:any):number;
-	insertAt(data:any, pos:number):void;
-	map(functor:WebixCallback, master:any):any[];
-	remove(value:any):void;
-	removeAt(pos:number, len:number):void;
-}
-var PowerArray:PowerArray;
-
-interface ProgressBar{
-	hideProgress():void;
-	showProgress(config?:any):void;
-}
-var ProgressBar:ProgressBar;
-
-interface RecordBind{
-	}
-var RecordBind:RecordBind;
-
-interface RenderStack{
-	customize(obj:any):void;
-	getItemNode(id:string):void;
-	locate(e:Event):string;
-	render(id:string, data:any, type:string):void;
-	showItem(id:string):void;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-var RenderStack:RenderStack;
-
-interface Scrollable{
-	getScrollState():any;
-	scrollTo(x:number, y:number):void;
-}
-var Scrollable:Scrollable;
-
-interface SelectionModel{
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	isSelected(id:string):boolean;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	unselect(id?:string):void;
-	unselectAll():void;
-}
-var SelectionModel:SelectionModel;
-
-interface Settings{
-	define(property:string, value:any):void;
-	config: { [key: string]: any; };
-	name: string;
-}
-var Settings:Settings;
-
-interface SingleRender{
-	customize(obj:any):void;
-	render(id:string, data:any, type:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	type: { [key: string]: any; };
-}
-var SingleRender:SingleRender;
-
-interface TablePaste{
-	}
-var TablePaste:TablePaste;
-
-interface Touch{
-	disable():void;
-	enable():void;
-	limit(mode:boolean):void;
-	scrollTo(node:HTMLElement, x:number, y:number, speed:string):void;
-	config: any;
-}
-var Touch:Touch;
-
-interface TreeAPI{
-	close(id:string):void;
-	closeAll():void;
-	getOpenItems():any[];
-	getState():any;
-	isBranchOpen(id:string):boolean;
-	open(id:string):void;
-	openAll():void;
-	setState(state:any):void;
-}
-var TreeAPI:TreeAPI;
-
-interface TreeClick{
-	webix_tree_checkbox(obj:any, common:{ [key: string]: any; }):string;
-	webix_tree_close(obj:any, common:{ [key: string]: any; }):string;
-	webix_tree_open(obj:any, common:{ [key: string]: any; }):string;
-}
-var TreeClick:TreeClick;
-
-interface TreeCollection{
-	add(obj:any, index?:number):string;
-	addBind(source:any, rule:string, format:string):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearValidation():void;
-	count():number;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBindData(key:string, update:boolean):void;
-	getBranchIndex(id:string, parent?:string):number;
-	getCursor():number;
-	getFirstChildId(id:string):string;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
-	getParentId(id:string):string;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
-	hasEvent(name:string):boolean;
-	isBranch(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	refreshCursor():void;
-	remove(id:string):void;
-	removeBind(source:any):void;
-	saveBatch(func:WebixCallback):void;
-	serialize():any;
-	setBindData(data:any, key:string):void;
-	setCursor(cursor:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	config: { [key: string]: any; };
-	name: string;
-}
-var TreeCollection:TreeCollection;
-
-interface TreeDataLoader{
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
-}
-var TreeDataLoader:TreeDataLoader;
-
-interface TreeDataMove{
-	copy(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	move(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	$dropAllow: WebixCallback;
-}
-var TreeDataMove:TreeDataMove;
-
-interface TreeRenderStack{
-	getItemNode(id:string):void;
-	getItemNode(id:string):HTMLElement;
-}
-var TreeRenderStack:TreeRenderStack;
-
-interface TreeStateCheckbox{
-	checkAll(id?:string):void;
-	checkItem(id:string):void;
-	getChecked():any[];
-	isChecked(id:string):boolean;
-	uncheckAll(id?:string):void;
-	uncheckItem(id:string):void;
-}
-var TreeStateCheckbox:TreeStateCheckbox;
-
-interface TreeStore{
-	add(obj:any, index:number, pid:string):string;
-	changeId(old:string, newid:string):void;
-	clearAll():void;
-	count():number;
-	each(code:WebixCallback, master:any, all:boolean, pid:string):void;
-	eachChild(pid:string, code:WebixCallback, master?:any, all?:boolean):void;
-	eachOpen(code:WebixCallback, master?:any, pid?:string):void;
-	eachSubItem(pid:string, code:WebixCallback):void;
-	getBranch(id:string):any[];
-	getBranchIndex(id:string, parent?:string):number;
-	getFirstChildId(id:string):string;
-	getNextSiblingId(id:any):string;
-	getParentId(id:string):string;
-	getPrevSiblingId(id:any):string;
-	getTopRange():any[];
-	isBranch(id:string):boolean;
-	provideApi(target:any, eventable:boolean):void;
-	remove(id:string):void;
-	serialize():any;
-	name: string;
-}
-var TreeStore:TreeStore;
-
-interface TreeTableClick{
-	}
-var TreeTableClick:TreeTableClick;
-
-interface TreeTablePaste{
-	insert(data:any[]):void;
-}
-var TreeTablePaste:TreeTablePaste;
-
-interface TreeType{
-	checkbox(obj:any, common:any):string;
-	folder(obj:any, common:any):string;
-	icon(obj:any, common:any):string;
-	space(obj:any, common:any):string;
-}
-var TreeType:TreeType;
-
-interface UIExtension{
-	}
-var UIExtension:UIExtension;
-
-interface UIManager{
-	addHotKey(key:string, handler:WebixCallback, obj?:any):void;
-	canFocus(id:string):boolean;
-	destructor():void;
-	getFocus():webix.ui.baseview;
-	getNext(view:any):any;
-	getPrev(view:any):any;
-	getState(id:string, childs:boolean):any;
-	getTop(id:string):any;
-	hasFocus(id:string):boolean;
-	removeHotKey(key:string, handler?:WebixCallback, obj?:any):void;
-	setFocus(id:string):void;
-	setState(state:any):void;
-}
-var UIManager:UIManager;
-
-interface UploadDriver{
-	flash: any;
-	html5: any;
-}
-var UploadDriver:UploadDriver;
-
-interface ValidateCollection{
-	clearValidation():void;
-	validate(id?:string):boolean;
-}
-var ValidateCollection:ValidateCollection;
-
-interface ValidateData{
-	clearValidation():void;
-	validate():boolean;
-}
-var ValidateData:ValidateData;
-
-interface ValueBind{
-	}
-var ValueBind:ValueBind;
-
-interface Values{
-	clear():void;
-	focus(item:string):void;
-	getCleanValues():any;
-	getDirtyValues():any;
-	getValues(details?:any):any[];
-	isDirty():boolean;
-	setDirty(mark?:boolean):void;
-	setValues(values:any, update?:boolean):void;
-}
-var Values:Values;
-
-interface VirtualRenderStack{
-	getItemNode(id:string):void;
-	render(id:string, data:any, type:string):void;
-	showItem(id:string):void;
-}
-var VirtualRenderStack:VirtualRenderStack;
-
-
-namespace ui {
-
-
-
-function delay(config:any):void;
-function fullScreen():void;
-function hasMethod(name:string, method_name:string):boolean;
-function resize():void;
-function zIndex():number;
-var scrollSize: number;
-var zIndexBase: number;
-
-interface baselayoutConfig{
-	animate?: any;
-	borderless?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	responsive?: string;
-	rows?: any[];
-	visibleBatch?: string;
-	width?: number;
-}
-interface baselayout extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	reconstruct():void;
-	removeView(id:string):void;
-	resize():void;
-	resizeChildren():void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: baselayoutConfig;
-	name: string;
-}
-interface baseviewConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	width?: number;
-}
-interface baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: baseviewConfig;
-	name: string;
-}
-interface protoConfig{
-	animate?: any;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	template?: string|WebixCallback;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-}
-interface proto extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getTopParentView():webix.ui.baseview;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	serialize():any;
-	setPage(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: protoConfig;
-	name: string;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface resizeareaConfig{
-	border?: boolean;
-	container?: string|HTMLElement;
-	cursor?: string;
-	dir?: string;
-	eventPos?: number;
-	height?: number;
-	id?: string;
-	on?: any;
-	start?: number;
-	width?: number;
-}
-interface resizearea{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	detachEvent(id:string):void;
-	hasEvent(name:string):boolean;
-	mapEvent(map:any):void;
-	unblockEvent():void;
-	config: resizeareaConfig;
-	name: string;
-}
-interface viewConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	width?: number;
-}
-interface view extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: viewConfig;
-	name: string;
-}
-interface vscrollConfig{
-	container?: HTMLElement;
-	id?: string;
-	on?: any;
-	scroll?: string;
-	scrollHeight?: number;
-	scrollPos?: number;
-	scrollSize?: number;
-	scrollStep?: number;
-	scrollVisible?: boolean;
-	scrollWidth?: number;
-	zoom?: number;
-}
-interface vscroll extends webix.ui.baseview{
-	activeArea(node:HTMLElement):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	detachEvent(id:string):void;
-	getScroll():number;
-	getSize():number;
-	hasEvent(name:string):boolean;
-	mapEvent(map:any):void;
-	scrollTo(pos:number):void;
-	sizeTo(size:number):void;
-	unblockEvent():void;
-	config: vscrollConfig;
-	name: string;
-}
-interface accordionConfig{
-	animate?: any;
-	borderless?: boolean;
-	collapsed?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	isolate?: boolean;
-	margin?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	multi?: boolean|string;
-	on?: any;
-	padding?: number;
-	paddingX?: number;
-	paddingY?: number;
-	panelClass?: string;
-	responsive?: string;
-	rows?: any[];
-	type?: string;
-	visibleBatch?: string;
-	width?: number;
-}
-interface accordion extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	reconstruct():void;
-	removeView(id:string):void;
-	resize():void;
-	resizeChildren():void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: accordionConfig;
-	name: string;
-}
-interface accordionitemConfig{
-	animate?: any;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	collapsed?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	header?: boolean|string|WebixCallback;
-	headerAlt?: string|WebixCallback;
-	headerAltHeight?: number;
-	headerHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	width?: number;
-}
-interface accordionitem extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	collapse():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	expand():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: accordionitemConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-}
-interface barcodeConfig{
-	animate?: any;
-	borderless?: boolean;
-	color?: string;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	paddingX?: number;
-	paddingY?: number;
-	textHeight?: number;
-	type?: any;
-	value?: string;
-	width?: number;
-}
-interface barcode extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	render():void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: barcodeConfig;
-	name: string;
-	types: any[];
-}
-interface buttonConfig{
-	align?: string;
-	animate?: any;
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: any;
-	popup?: any;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	value?: string;
-	width?: number;
-}
-interface button extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: buttonConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface calendarConfig{
-	animate?: any;
-	blockDates?: WebixCallback;
-	borderless?: boolean;
-	calendarHeader?: string;
-	calendarTime?: string;
-	calendarWeekHeader?: string;
-	cellHeight?: number;
-	container?: HTMLElement;
-	css?: string;
-	date?: any;
-	dayTemplate?: WebixCallback;
-	disabled?: boolean;
-	events?: WebixCallback;
-	gravity?: number;
-	headerHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	icons?: any;
-	id?: string;
-	maxDate?: Date|string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minDate?: Date|string;
-	minHeight?: number;
-	minWidth?: number;
-	minuteStep?: number;
-	monthSelect?: boolean;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	select?: boolean;
-	skipEmptyWeeks?: boolean;
-	timepicker?: boolean;
-	timepickerHeight?: number;
-	type?: string;
-	weekHeader?: boolean;
-	weekNumber?: boolean;
-	width?: number;
-}
-interface calendar extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getSelectedDate():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():any;
-	getVisibleDate():any;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	selectDate(date:any):void;
-	setValue(date:any):void;
-	show(force?:boolean, animation?:boolean):void;
-	showCalendar(date:any):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: calendarConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-}
-interface chartConfig{
-	alpha?: number;
-	animate?: any;
-	barWidth?: number;
-	border?: boolean;
-	borderColor?: string;
-	borderless?: boolean;
-	cant?: number;
-	color?: string|WebixCallback;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disableLines?: boolean;
-	disabled?: boolean;
-	eventRadius?: number;
-	fill?: string;
-	fixOverflow?: boolean;
-	gradient?: boolean|string|WebixCallback;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	item?: any;
-	label?: string|WebixCallback;
-	labelOffset?: number;
-	legend?: any;
-	line?: any;
-	lineColor?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	offset?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	origin?: number;
-	padding?: any;
-	pieHeight?: number;
-	pieInnerText?: string|WebixCallback;
-	preset?: string;
-	radius?: number;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	save?: string;
-	scale?: string;
-	scheme?: any;
-	series?: any[];
-	shadow?: boolean;
-	tooltip?: any;
-	type?: string;
-	url?: string;
-	value?: string|WebixTemplate;
-	width?: number;
-	x?: number;
-	xAxis?: any;
-	xValue?: string;
-	y?: number;
-	yAxis?: any;
-	yValue?: string;
-}
-interface chart extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addSeries(obj:any):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCanvas():void;
-	count():number;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getTopParentView():webix.ui.baseview;
-	group(config:any, mode:boolean):void;
-	hasEvent(name:string):boolean;
-	hide():void;
-	hideSeries(series:string):void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeAllSeries():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	serialize():any;
-	show(force?:boolean, animation?:boolean):void;
-	showSeries(series:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	ungroup(mode:boolean):void;
-	updateItem(id:string, data:any):void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	colormap: { [key: string]: any; };
-	config: chartConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	presets: { [key: string]: any; };
-}
-interface checkboxConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	checkValue?: string;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	customCheckbox?: boolean;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	uncheckValue?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface checkbox extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	toggle():void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: checkboxConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface carouselConfig{
-	animate?: any;
-	borderless?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	navigation?: any;
-	on?: any;
-	rows?: any[];
-	scrollSpeed?: string;
-	type?: string;
-	width?: number;
-}
-interface carousel extends webix.ui.baseview{
-	adjust():void;
-	adjustScroll(matrix:any):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getActiveId():string;
-	getActiveIndex():number;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getLayout():any;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	setActive(id:string):void;
-	setActiveIndex(index:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showNext():void;
-	showPrev():void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: carouselConfig;
-	name: string;
-}
-interface colorboardConfig{
-	animate?: any;
-	borderless?: boolean;
-	cols?: number;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxLightness?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minLightness?: number;
-	minWidth?: number;
-	on?: any;
-	palette?: any[];
-	rows?: number;
-	template?: WebixCallback;
-	value?: string;
-	width?: number;
-}
-interface colorboard extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):string;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: colorboardConfig;
-	name: string;
-}
-interface colorpickerConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	editable?: boolean;
-	format?: string;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	icons?: any;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	stringResult?: any;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	timeIcon?: string;
-	timepicker?: boolean;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface colorpicker extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getPopup():webix.ui.baseview;
-	getText():void;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: colorpickerConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface comboConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	options?: any;
-	placeholder?: string;
-	popup?: any;
-	popupWidth?: number;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	text?: string;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface combo extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getPopup():webix.ui.baseview;
-	getText():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: comboConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface contextConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	left?: number;
-	master?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	top?: number;
-	width?: number;
-	zIndex?: number;
-}
-interface context extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	attachTo(view:any):void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getContext():any;
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: contextConfig;
-	name: string;
-}
-interface contextmenuConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	layout?: string;
-	left?: number;
-	master?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	mouseEventDelay?: number;
-	move?: boolean;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	padding?: any;
-	pager?: any;
-	position?: string|WebixCallback;
-	ready?: WebixCallback;
-	relative?: string;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	subMenuPos?: string;
-	submenu?: any;
-	template?: string|WebixCallback;
-	templateCopy?: WebixCallback;
-	tooltip?: any;
-	top?: number;
-	type?: any;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-	zIndex?: number;
-}
-interface contextmenu extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	attachTo(view:any):void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	close():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	disableItem(id:string):void;
-	enable():void;
-	enableItem(id:string):void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBody():any;
-	getChildViews():any[];
-	getContext():any;
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getMenu(id:string|number):any;
-	getMenuItem(id:string):any;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getSubMenu(id:string|number):any;
-	getTopMenu():any;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	hideItem(id:string):void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	resizeChildren():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: contextmenuConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface counterConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	max?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	min?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	step?: number;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface counter extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():number;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	next(step?:number):void;
-	prev(step?:number):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:number):void;
-	shift(value?:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: counterConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface datatableConfig{
-	animate?: any;
-	autoConfig?: boolean;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	blockselect?: boolean;
-	borderless?: boolean;
-	checkboxRefresh?: boolean;
-	clipboard?: boolean|string;
-	columnWidth?: number;
-	columns?: any[];
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datafetch?: number;
-	datathrottle?: number;
-	datatype?: string;
-	delimiter?: any;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragColumn?: boolean|string;
-	dragscroll?: boolean|string;
-	editMath?: boolean;
-	editValue?: string;
-	editable?: boolean;
-	editaction?: string;
-	externalData?: WebixCallback;
-	filterMode?: any;
-	fixedRowHeight?: boolean;
-	footer?: boolean;
-	form?: string;
-	gravity?: number;
-	header?: boolean;
-	headerRowHeight?: number;
-	headermenu?: any;
-	height?: number;
-	hidden?: boolean;
-	hover?: string;
-	id?: string;
-	leftSplit?: number;
-	liveValidation?: boolean;
-	loadahead?: number;
-	math?: boolean;
-	maxHeight?: number;
-	maxWidth?: number;
-	minColumnHeight?: number;
-	minColumnWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	multiselect?: boolean;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	prerender?: boolean;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	resizeColumn?: boolean;
-	resizeRow?: boolean;
-	rightSplit?: number;
-	rowHeight?: number;
-	rowLineHeight?: number;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean;
-	scrollAlignY?: boolean;
-	scrollX?: boolean;
-	scrollY?: boolean;
-	select?: boolean|string;
-	spans?: any[];
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-	yCount?: number;
-}
-interface datatable extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCellCss(id:string, name:string, css:string):void;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	addRowCss(id:string, css:string):void;
-	addSpan(id:any, column:string, width:number, height:number, value?:string, css?:string):void;
-	adjust():void;
-	adjustColumn(id:string|number, header?:string):void;
-	adjustRowHeight(columnId:string, silent:boolean):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearSelection():void;
-	clearValidation():void;
-	collectValues(id:string):any[];
-	columnId(index:number):string;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	eachColumn(handler:WebixCallback, all?:boolean):void;
-	eachRow(handler:WebixCallback, all?:boolean):void;
-	edit(id:any):void;
-	editCancel():void;
-	editCell(row:string, col:string, preserve?:boolean, show?:boolean):void;
-	editColumn(id:string):void;
-	editNext():boolean;
-	editRow(id:string):void;
-	editStop():void;
-	enable():void;
-	exists(id:string):boolean;
-	exportToExcel(url?:string):void;
-	exportToPDF(url?:string):void;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	filterByAll():void;
-	find(criterion:WebixCallback, first?:boolean):any;
-	focusEditor():void;
-	getChildViews():any[];
-	getColumnConfig(id:string):any;
-	getColumnIndex(id:string):number;
-	getEditState():any;
-	getEditor(row?:any, column?:string|number):any;
-	getEditorValue():string;
-	getFilter(columnID:string):any;
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getHeaderContent(id:string):{ [key: string]: any; };
-	getHeaderNode(columnId:string, rowIndex?:number):HTMLElement;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(asArray?:boolean, asString?:boolean):any;
-	getSelectedItem(mode?:boolean):void;
-	getState():any;
-	getText(rowid:string, colid:string):string;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	hideColumn(id:string):void;
-	hideOverlay():void;
-	isColumnVisible(id:string):boolean;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(node:HTMLElement|Event):any;
-	mapCells(startrow:number, startcol:string, numrows:number, numcols:number, callback:WebixCallback):void;
-	mapEvent(map:any):void;
-	mapSelection(callback:WebixCallback):void;
-	markSorting(column_id:string, dir:string):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveColumn(id:string, index:number):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	refreshColumns(config?:any[]):void;
-	refreshFilter(id:string):void;
-	refreshHeaderContent():void;
-	registerFilter(node:HTMLElement, config:any, obj:any):void;
-	remove(id:string):void;
-	removeCellCss(id:string, name:string, css_name:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	removeRowCss(id:string, css_name:string):void;
-	removeSpan(id:string|number, column:string):void;
-	render(id:string, data:any, operation:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(row_id:string, preserve:boolean):void;
-	selectRange(row_id:any, end_row_id:any):void;
-	serialize():any;
-	setColumnWidth(id:string, width:number):void;
-	setPage(page:number):void;
-	setRowHeight(id:string, height:number):void;
-	setState(state:any):void;
-	show(force?:boolean, animation?:boolean):void;
-	showCell(row:string, column:string):void;
-	showColumn(id:string):void;
-	showColumnBatch(batch:string|number):void;
-	showItem(id:string):void;
-	showItemByIndex(index:number):void;
-	showOverlay(message:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	ungroup(mode:boolean):void;
-	unselect(row_id:string):void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	validateEditor(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: datatableConfig;
-	headerContent: any;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	waitData: PromisedData;
-}
-interface dataviewConfig{
-	animate?: any;
-	autoheight?: boolean;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datafetch?: number;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	loadahead?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	template?: string|WebixCallback;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-}
-interface dataview extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getTopParentView():webix.ui.baseview;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: dataviewConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-	waitData: PromisedData;
-}
-interface datepickerConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	editable?: boolean;
-	format?: string;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	icons?: any;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	stringResult?: any;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	text?: string;
-	timeIcon?: string;
-	timepicker?: boolean;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface datepicker extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getPopup():webix.ui.baseview;
-	getText():void;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: datepickerConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface fieldsetConfig{
-	animate?: any;
-	body?: webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	label?: any;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	width?: number;
-}
-interface fieldset extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: fieldsetConfig;
-	name: string;
-}
-interface formConfig{
-	animate?: any;
-	autoheight?: boolean;
-	borderless?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datatype?: string;
-	disabled?: boolean;
-	elements?: any[];
-	elementsConfig?: { [key: string]: any; };
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	isolate?: boolean;
-	margin?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	padding?: number;
-	paddingX?: number;
-	paddingY?: number;
-	responsive?: string;
-	rows?: any[];
-	rules?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	type?: string;
-	url?: string;
-	visibleBatch?: string;
-	width?: number;
-}
-interface form extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clear():void;
-	clearValidation():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus(item:string):void;
-	getChildViews():any[];
-	getCleanValues():any;
-	getDirtyValues():any;
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getScrollState():any;
-	getTopParentView():webix.ui.baseview;
-	getValues(details?:any):any;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isDirty():boolean;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	reconstruct():void;
-	refresh():void;
-	removeView(id:string):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	resizeChildren():void;
-	scrollTo(x:number, y:number):void;
-	setDirty(mark?:boolean):void;
-	setValues(values:any, update?:boolean):void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: formConfig;
-	name: string;
-}
-interface grouplistConfig{
-	animate?: any;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	layout?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	template?: string|WebixCallback;
-	templateBack?: string|WebixTemplate;
-	templateCopy?: WebixCallback;
-	templateGroup?: string|WebixTemplate;
-	templateItem?: string|WebixTemplate;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-}
-interface grouplist extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getOpenState():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	ungroup(mode:boolean):void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: grouplistConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface headerlayoutConfig{
-	animate?: any;
-	borderless?: boolean;
-	collapsed?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	isolate?: boolean;
-	margin?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	multi?: boolean|string;
-	on?: any;
-	padding?: number;
-	paddingX?: number;
-	paddingY?: number;
-	panelClass?: string;
-	responsive?: string;
-	rows?: any[];
-	type?: string;
-	visibleBatch?: string;
-	width?: number;
-}
-interface headerlayout extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	reconstruct():void;
-	removeView(id:string):void;
-	resize():void;
-	resizeChildren():void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: headerlayoutConfig;
-	name: string;
-}
-interface htmlformConfig{
-	animate?: any;
-	autoheight?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datatype?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	src?: string;
-	template?: string|WebixCallback;
-	type?: string;
-	url?: string;
-	width?: number;
-}
-interface htmlform extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clear(all?:boolean):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus(item:string):void;
-	getChildViews():any[];
-	getCleanValues():any;
-	getDirtyValues():any;
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getScrollState():any;
-	getTopParentView():webix.ui.baseview;
-	getValues(details?:any):any[];
-	hasEvent(name:string):boolean;
-	hide():void;
-	isDirty():boolean;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	setContent(node:any):void;
-	setDirty(mark?:boolean):void;
-	setHTML(html:string):void;
-	setValues(values:any, update?:boolean):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: htmlformConfig;
-	name: string;
-}
-interface iconConfig{
-	align?: string;
-	animate?: any;
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: any;
-	popup?: any;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	value?: string;
-	width?: number;
-}
-interface icon extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: iconConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface iframeConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	src?: string;
-	width?: number;
-}
-interface iframe extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getIframe():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getWindow():HTMLElement;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(value:string):void;
-	mapEvent(map:any):void;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: iframeConfig;
-	name: string;
-}
-interface labelConfig{
-	align?: string;
-	animate?: any;
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: any;
-	popup?: any;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	value?: string;
-	width?: number;
-}
-interface label extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setHTML(html:string):void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: labelConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface layoutConfig{
-	animate?: any;
-	borderless?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	isolate?: boolean;
-	margin?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	padding?: number;
-	paddingX?: number;
-	paddingY?: number;
-	responsive?: string;
-	rows?: any[];
-	type?: string;
-	visibleBatch?: string;
-	width?: number;
-}
-interface layout extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	reconstruct():void;
-	removeView(id:string):void;
-	resize():void;
-	resizeChildren():void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: layoutConfig;
-	name: string;
-}
-interface listConfig{
-	animate?: any;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	layout?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	template?: string|WebixCallback;
-	templateCopy?: WebixCallback;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-}
-interface list extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: listConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface menuConfig{
-	animate?: any;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	layout?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	subMenuPos?: string;
-	submenu?: any;
-	template?: string|WebixCallback;
-	templateCopy?: WebixCallback;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-}
-interface menu extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	disableItem(id:string):void;
-	enable():void;
-	enableItem(id:string):void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getMenu(id:string|number):any;
-	getMenuItem(id:string):any;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getSubMenu(id:string|number):any;
-	getTopMenu():any;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	hideItem(id:string):void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: menuConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface multiviewConfig{
-	animate?: any;
-	borderless?: boolean;
-	cells?: any;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	fitBiggest?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	responsive?: string;
-	rows?: any[];
-	visibleBatch?: string;
-	width?: number;
-}
-interface multiview extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	back(step:number):void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getActiveId():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	reconstruct():void;
-	removeView(id:string):void;
-	resize():void;
-	resizeChildren():void;
-	setValue(toshow:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: multiviewConfig;
-	name: string;
-}
-interface organogramConfig{
-	animate?: any;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	filterMode?: any;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	template?: string|WebixCallback;
-	threeState?: boolean;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-}
-interface organogram extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	close(id:string):void;
-	closeAll():void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBranchIndex(id:string, parent?:string):number;
-	getChildViews():any[];
-	getFirstChildId(id:string):string;
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
-	getNode():any;
-	getOpenItems():any[];
-	getParentId(id:string):string;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getState():any;
-	getTopParentView():webix.ui.baseview;
-	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isBranch(id:string):boolean;
-	isBranchOpen(id:string):boolean;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	open(id:string):void;
-	openAll():void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setState(state:any):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	ungroup(mode:boolean):void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: organogramConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface pagerConfig{
-	animate?: any;
-	apiOnly?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	count?: number;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	group?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	limit?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	page?: number;
-	size?: number;
-	template?: string|WebixCallback;
-	width?: number;
-}
-interface pager extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clone(config:any):any;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh(id?:string):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	select(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: pagerConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-}
-interface popupConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	left?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	top?: number;
-	width?: number;
-	zIndex?: number;
-}
-interface popup extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: popupConfig;
-	name: string;
-}
-interface propertyConfig{
-	animate?: any;
-	autoheight?: boolean;
-	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datatype?: string;
-	disabled?: boolean;
-	editValue?: string;
-	editable?: boolean;
-	editaction?: string;
-	elements?: any;
-	form?: string;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	nameWidth?: number;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	template?: string|WebixCallback;
-	url?: string;
-	width?: number;
-}
-interface property extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	edit(id:any):void;
-	editCancel():void;
-	editNext():boolean;
-	editStop():void;
-	enable():void;
-	focusEditor():void;
-	getChildViews():any[];
-	getEditState():any;
-	getEditor(id?:string):any;
-	getEditorValue():string;
-	getFormView():webix.ui.baseview;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getNode():any;
-	getParentView():any;
-	getScrollState():any;
-	getTopParentView():webix.ui.baseview;
-	getValues():any[];
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	registerType(name:string, data:any):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	setValues(values:any, update?:boolean):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	updateItem():void;
-	validateEditor(id?:string):boolean;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: propertyConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_edit: { [key: string]: any; };
-	on_mouse_move: WebixCallback;
-	on_render: { [key: string]: any; };
-	type: { [key: string]: any; };
-}
-interface radioConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	customRadio?: boolean;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	optionHeight?: number;
-	options?: any[];
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	vertical?: boolean;
-	width?: number;
-}
-interface radio extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: radioConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface resizerConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	width?: number;
-}
-interface resizer extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: resizerConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-}
-interface richselectConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	options?: any;
-	placeholder?: string;
-	popup?: any;
-	popupWidth?: number;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	text?: string;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface richselect extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getPopup():webix.ui.baseview;
-	getText():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: richselectConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface multitextConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	iconWidth?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	separator?: string;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface multitext extends webix.ui.baseview{
-	addSection():string|number;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	getValueHere():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	removeSection(id?:string|number):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	setValueHere(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: multitextConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface multiselectConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	optionWidth?: number;
-	options?: any;
-	placeholder?: string;
-	popup?: any;
-	popupWidth?: number;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	separator?: string;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	text?: string;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface multiselect extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getPopup():webix.ui.baseview;
-	getText():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: multiselectConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface scrollviewConfig{
-	animate?: any;
-	body?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	width?: number;
-}
-interface scrollview extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getScrollState():any;
-	getTopParentView():webix.ui.baseview;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	resizeChildren():void;
-	scrollTo(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showView(id:string):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: scrollviewConfig;
-	name: string;
-}
-interface searchConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	icon?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface search extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: searchConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface segmentedConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	multiview?: boolean;
-	name?: string;
-	on?: any;
-	options?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface segmented extends webix.ui.baseview{
-	addOption(id:string, value:any, show?:boolean, index?:number):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	optionIndex(ID:string):number;
-	refresh():void;
-	removeOption(id:string):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: segmentedConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface selectConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	options?: any[]|string;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface select extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: selectConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface sliderConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	max?: any;
-	maxHeight?: number;
-	maxWidth?: number;
-	min?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	step?: number;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	title?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface slider extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$touchCapture: any;
-	$view: HTMLElement;
-	$width: number;
-	config: sliderConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface spacerConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	width?: number;
-}
-interface spacer extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: spacerConfig;
-	name: string;
-}
-interface submenuConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	layout?: string;
-	left?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	mouseEventDelay?: number;
-	move?: boolean;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	padding?: any;
-	pager?: any;
-	position?: string|WebixCallback;
-	ready?: WebixCallback;
-	relative?: string;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	subMenuPos?: string;
-	submenu?: any;
-	template?: string|WebixCallback;
-	templateCopy?: WebixCallback;
-	tooltip?: any;
-	top?: number;
-	type?: any;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-	zIndex?: number;
-}
-interface submenu extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	close():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	disableItem(id:string):void;
-	enable():void;
-	enableItem(id:string):void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBody():any;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getMenu(id:string|number):any;
-	getMenuItem(id:string):any;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getSubMenu(id:string|number):any;
-	getTopMenu():any;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	hideItem(id:string):void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	resizeChildren():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: submenuConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface suggestConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	filter?: WebixCallback;
-	fitMaster?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	input?: any;
-	keyPressTimeout?: number;
-	left?: number;
-	master?: webix.ui.baseview;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	template?: string|WebixTemplate;
-	textValue?: string;
-	top?: number;
-	type?: string;
-	width?: number;
-	zIndex?: number;
-}
-interface suggest extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getItemText(id:string):string;
-	getList():webix.ui.baseview;
-	getMasterValue():any;
-	getNode():any;
-	getParentView():any;
-	getSuggestion():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string|number;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	linkInput(input:HTMLElement):void;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setMasterValue(value:any):void;
-	setPosition(x:number, y:number):void;
-	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: suggestConfig;
-	name: string;
-}
-interface multisuggestConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	buttonText?: string;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	filter?: WebixCallback;
-	fitMaster?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	input?: any;
-	keyPressTimeout?: number;
-	left?: number;
-	master?: webix.ui.baseview;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	separator?: string;
-	template?: string|WebixTemplate;
-	textValue?: string;
-	top?: number;
-	type?: string;
-	width?: number;
-	zIndex?: number;
-}
-interface multisuggest extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getButton():webix.ui.baseview;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getItemText(id:string):string;
-	getList():webix.ui.baseview;
-	getMasterValue():any;
-	getNode():any;
-	getParentView():any;
-	getSuggestion():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string|number;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	linkInput(input:HTMLElement):void;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setMasterValue(value:any):void;
-	setPosition(x:number, y:number):void;
-	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: multisuggestConfig;
-	name: string;
-}
-interface datasuggestConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	filter?: WebixCallback;
-	fitMaster?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	input?: any;
-	keyPressTimeout?: number;
-	left?: number;
-	master?: webix.ui.baseview;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	template?: string|WebixTemplate;
-	textValue?: string;
-	top?: number;
-	type?: string;
-	width?: number;
-	zIndex?: number;
-}
-interface datasuggest extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getItemText(id:string):string;
-	getList():webix.ui.baseview;
-	getMasterValue():any;
-	getNode():any;
-	getParentView():any;
-	getSuggestion():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string|number;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	linkInput(input:HTMLElement):void;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setMasterValue(value:any):void;
-	setPosition(x:number, y:number):void;
-	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: datasuggestConfig;
-	name: string;
-}
-interface gridsuggestConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	filter?: WebixCallback;
-	fitMaster?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	input?: any;
-	keyPressTimeout?: number;
-	left?: number;
-	master?: webix.ui.baseview;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	template?: string|WebixTemplate;
-	textValue?: string;
-	top?: number;
-	type?: string;
-	width?: number;
-	zIndex?: number;
-}
-interface gridsuggest extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getItemText(id:string):string;
-	getList():webix.ui.baseview;
-	getMasterValue():any;
-	getNode():any;
-	getParentView():any;
-	getSuggestion():string;
-	getTopParentView():webix.ui.baseview;
-	getValue():string|number;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	linkInput(input:HTMLElement):void;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setMasterValue(value:any):void;
-	setPosition(x:number, y:number):void;
-	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: gridsuggestConfig;
-	name: string;
-}
-interface tabbarConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	bottomOffset?: number;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	moreTemplate?: WebixCallback;
-	multiview?: boolean;
-	name?: string;
-	on?: any;
-	options?: any;
-	placeholder?: string;
-	popup?: any;
-	popupTemplate?: WebixCallback;
-	popupWidth?: number;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	tabMargin?: number;
-	tabMinWidth?: number;
-	tabMoreWidth?: number;
-	tabOffset?: number;
-	tabbarPopup?: webix.ui.baseview;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	topOffset?: number;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-	yCount?: number;
-}
-interface tabbar extends webix.ui.baseview{
-	addOption(id:string, value:any, show?:boolean, index?:number):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getPopup():webix.ui.baseview;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	optionIndex(ID:string):number;
-	refresh():void;
-	removeOption(id:string):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: tabbarConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface tabviewConfig{
-	animate?: any;
-	borderless?: boolean;
-	cells?: any[];
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	isolate?: boolean;
-	margin?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	multiview?: any;
-	on?: any;
-	padding?: number;
-	paddingX?: number;
-	paddingY?: number;
-	responsive?: string;
-	rows?: any[];
-	tabbar?: any;
-	type?: string;
-	visibleBatch?: string;
-	width?: number;
-}
-interface tabview extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getMultiview():any;
-	getNode():any;
-	getParentView():any;
-	getTabbar():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	reconstruct():void;
-	removeView(id:string):void;
-	resize():void;
-	resizeChildren():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: tabviewConfig;
-	name: string;
-}
-interface templateConfig{
-	animate?: any;
-	autoheight?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datatype?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	src?: string;
-	template?: string|WebixCallback;
-	type?: string;
-	url?: string;
-	width?: number;
-}
-interface template extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getScrollState():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	setContent(node:any):void;
-	setHTML(html:string):void;
-	setValues(obj:any, update?:boolean):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: templateConfig;
-	name: string;
-}
-interface textConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface text extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: textConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface textareaConfig{
-	align?: string;
-	animate?: any;
-	attributes?: { [key: string]: any; };
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputPadding?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	labelWidth?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
-	relatedAction?: string;
-	relatedView?: string;
-	required?: boolean;
-	suggest?: string|webix.ui.baseview;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	validate?: boolean;
-	validateEvent?: string;
-	value?: string;
-	width?: number;
-}
-interface textarea extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: textareaConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface toggleConfig{
-	align?: string;
-	animate?: any;
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	name?: string;
-	on?: any;
-	placeholder?: any;
-	popup?: any;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	value?: string;
-	width?: number;
-}
-interface toggle extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	toggle():void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: toggleConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface toolbarConfig{
-	animate?: any;
-	borderless?: boolean;
-	cols?: any[];
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datatype?: string;
-	disabled?: boolean;
-	elements?: any[];
-	elementsConfig?: { [key: string]: any; };
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	isolate?: boolean;
-	margin?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	padding?: number;
-	paddingX?: number;
-	paddingY?: number;
-	responsive?: string;
-	rows?: any[];
-	rules?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	type?: string;
-	url?: string;
-	visibleBatch?: string;
-	width?: number;
-}
-interface toolbar extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clear():void;
-	clearValidation():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	focus(item:string):void;
-	getChildViews():any[];
-	getCleanValues():any;
-	getDirtyValues():any;
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getScrollState():any;
-	getTopParentView():webix.ui.baseview;
-	getValues(details?:any):any[];
-	hasEvent(name:string):boolean;
-	hide():void;
-	index(obj:any):number;
-	isDirty():boolean;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	mapEvent(map:any):void;
-	parse(data:any, type:string):void;
-	reconstruct():void;
-	refresh():void;
-	removeView(id:string):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	resizeChildren():void;
-	scrollTo(x:number, y:number):void;
-	setDirty(mark?:boolean):void;
-	setValues(values:any, update?:boolean):void;
-	show(force?:boolean, animation?:boolean):void;
-	showBatch(name:string):void;
-	unbind():void;
-	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
-	$height: number;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: toolbarConfig;
-	name: string;
-}
-interface tooltipConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	dx?: number;
-	dy?: number;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	on?: any;
-	template?: string|WebixCallback;
-	width?: number;
-}
-interface tooltip extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: tooltipConfig;
-	name: string;
-	type: { [key: string]: any; };
-}
-interface treeConfig{
-	animate?: any;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean;
-	dragscroll?: boolean|string;
-	filterMode?: any;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean;
-	template?: string|WebixCallback;
-	templateCopy?: WebixCallback;
-	threeState?: boolean;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-}
-interface tree extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	checkAll(id?:string):void;
-	checkItem(id:string):void;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	close(id:string):void;
-	closeAll():void;
-	copy(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBranchIndex(id:string, parent?:string):number;
-	getChecked():any[];
-	getChildViews():any[];
-	getFirstChildId(id:string):string;
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
-	getNode():any;
-	getOpenItems():any[];
-	getParentId(id:string):string;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getState():any;
-	getTopParentView():webix.ui.baseview;
-	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isBranch(id:string):boolean;
-	isBranchOpen(id:string):boolean;
-	isChecked(id:string):boolean;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveSelection(direction:string):void;
-	open(id:string):void;
-	openAll():void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setState(state:any):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	uncheckAll(id?:string):void;
-	uncheckItem(id:string):void;
-	ungroup(mode:boolean):void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: treeConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface treetableConfig{
-	animate?: any;
-	autoConfig?: boolean;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	blockselect?: boolean;
-	borderless?: boolean;
-	checkboxRefresh?: boolean;
-	clipboard?: boolean|string;
-	columnWidth?: number;
-	columns?: any[];
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datafetch?: number;
-	datathrottle?: number;
-	datatype?: string;
-	delimiter?: any;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragColumn?: boolean|string;
-	dragscroll?: boolean|string;
-	editMath?: boolean;
-	editValue?: string;
-	editable?: boolean;
-	editaction?: string;
-	externalData?: WebixCallback;
-	filterMode?: any;
-	fixedRowHeight?: boolean;
-	footer?: boolean;
-	form?: string;
-	gravity?: number;
-	header?: boolean;
-	headerRowHeight?: number;
-	headermenu?: any;
-	height?: number;
-	hidden?: boolean;
-	hover?: string;
-	id?: string;
-	leftSplit?: number;
-	liveValidation?: boolean;
-	loadahead?: number;
-	math?: boolean;
-	maxHeight?: number;
-	maxWidth?: number;
-	minColumnHeight?: number;
-	minColumnWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	multiselect?: boolean;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	prerender?: boolean;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	resizeColumn?: boolean;
-	resizeRow?: boolean;
-	rightSplit?: number;
-	rowHeight?: number;
-	rowLineHeight?: number;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean;
-	scrollAlignY?: boolean;
-	scrollX?: boolean;
-	scrollY?: boolean;
-	select?: boolean|string;
-	spans?: any[];
-	threeState?: boolean;
-	tooltip?: any;
-	type?: any;
-	url?: string;
-	width?: number;
-	yCount?: number;
-}
-interface treetable extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCellCss(id:string, name:string, css:string):void;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	addRowCss(id:string, css:string):void;
-	adjust():void;
-	adjustColumn(id:string|number, header?:string):void;
-	adjustRowHeight(columnId:string, silent:boolean):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	checkAll(id?:string):void;
-	checkItem(id:string):void;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	close(id:string):void;
-	closeAll():void;
-	collectValues(id:string):any[];
-	columnId(index:number):string;
-	copy(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	count():number;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	eachColumn(handler:WebixCallback, all?:boolean):void;
-	eachRow(handler:WebixCallback, all?:boolean):void;
-	edit(id:any):void;
-	editCancel():void;
-	editCell(row:string, col:string, preserve?:boolean, show?:boolean):void;
-	editColumn(id:string):void;
-	editNext():boolean;
-	editRow(id:string):void;
-	editStop():void;
-	enable():void;
-	exists(id:string):boolean;
-	exportToExcel(url?:string):void;
-	exportToPDF(url?:string):void;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	filterByAll():void;
-	find(criterion:WebixCallback, first?:boolean):any;
-	focusEditor():void;
-	getBranchIndex(id:string, parent?:string):number;
-	getChecked():any[];
-	getChildViews():any[];
-	getColumnConfig(id:string):any;
-	getColumnIndex(id:string):number;
-	getEditState():any;
-	getEditor(row?:any, column?:string|number):any;
-	getEditorValue():string;
-	getFilter(columnID:string):any;
-	getFirstChildId(id:string):string;
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getHeaderContent(id:string):{ [key: string]: any; };
-	getHeaderNode(columnId:string, rowIndex?:number):HTMLElement;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
-	getNode():any;
-	getOpenItems():any[];
-	getPage():number;
-	getPager():any;
-	getParentId(id:string):string;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
-	getScrollState():any;
-	getSelectedId(asArray?:boolean, asString?:boolean):any;
-	getSelectedItem(mode?:boolean):void;
-	getState():any;
-	getText(rowid:string, colid:string):string;
-	getTopParentView():webix.ui.baseview;
-	getVisibleCount():number;
-	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	hideColumn(id:string):void;
-	hideOverlay():void;
-	isBranch(id:string):boolean;
-	isBranchOpen(id:string):boolean;
-	isChecked(id:string):boolean;
-	isColumnVisible(id:string):boolean;
-	isEnabled():boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(node:HTMLElement|Event):any;
-	mapCells(startrow:number, startcol:string, numrows:number, numcols:number, callback:WebixCallback):void;
-	mapEvent(map:any):void;
-	markSorting(column_id:string, dir:string):void;
-	move(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	moveBottom(id:string):void;
-	moveColumn(id:string, index:number):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	open(id:string):void;
-	openAll():void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	refreshColumns(config?:any[]):void;
-	refreshFilter(id:string):void;
-	refreshHeaderContent():void;
-	registerFilter(node:HTMLElement, config:any, obj:any):void;
-	remove(id:string):void;
-	removeCellCss(id:string, name:string, css_name:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	removeRowCss(id:string, css_name:string):void;
-	render(id:string, data:any, operation:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	serialize():any;
-	setColumnWidth(id:string, width:number):void;
-	setPage(page:number):void;
-	setRowHeight(id:string, height:number):void;
-	setState(state:any):void;
-	show(force?:boolean, animation?:boolean):void;
-	showCell(row:string, column:string):void;
-	showColumn(id:string):void;
-	showColumnBatch(batch:string|number):void;
-	showItem(id:string):void;
-	showItemByIndex(index:number):void;
-	showOverlay(message:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	uncheckAll(id?:string):void;
-	uncheckItem(id:string):void;
-	ungroup(mode:boolean):void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	validateEditor(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: treetableConfig;
-	headerContent: any;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	waitData: PromisedData;
-}
-interface unitlistConfig{
-	animate?: any;
-	autoheight?: boolean;
-	autowidth?: boolean;
-	borderless?: boolean;
-	click?: string|WebixCallback;
-	clipboard?: boolean|string;
-	container?: HTMLElement;
-	css?: string;
-	data?: string|any[];
-	dataFeed?: string|WebixCallback;
-	datathrottle?: number;
-	datatype?: string;
-	disabled?: boolean;
-	drag?: boolean|string;
-	dragscroll?: boolean|string;
-	externalData?: WebixCallback;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	layout?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	mouseEventDelay?: number;
-	navigation?: boolean;
-	on?: any;
-	onClick?: { [key: string]: any; };
-	onContext?: { [key: string]: any; };
-	onDblClick?: WebixCallback;
-	onMouseMove?: WebixCallback;
-	pager?: any;
-	ready?: WebixCallback;
-	removeMissed?: boolean;
-	rules?: any;
-	save?: string;
-	scheme?: any;
-	scroll?: boolean|string;
-	scrollSpeed?: string;
-	select?: boolean|string;
-	sort?: WebixCallback;
-	template?: string|WebixCallback;
-	templateCopy?: WebixCallback;
-	tooltip?: any;
-	type?: any;
-	uniteBy?: WebixCallback;
-	url?: string;
-	width?: number;
-	xCount?: number;
-	yCount?: number;
-}
-interface unitlist extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
-	addCss(id:string|number, css:string, silent?:boolean):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	clearAll():void;
-	clearCss(css:string, silent?:boolean):void;
-	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
-	count():number;
-	customize(obj:any):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	exists(id:string):boolean;
-	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getChildViews():any[];
-	getFirstId():string;
-	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNode():any;
-	getPage():number;
-	getPager():any;
-	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getScrollState():any;
-	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	getTopParentView():webix.ui.baseview;
-	getUnitList(name:string):any[];
-	getUnits():any[];
-	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isSelected(id:string):boolean;
-	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
-	mapEvent(map:any):void;
-	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
-	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	scrollTo(x:number, y:number):void;
-	select(id:string|any[], preserve:boolean):void;
-	selectAll(from?:string, to?:string):void;
-	serialize():any;
-	setPage(page:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
-	sort(by:string, dir?:string, as?:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	unselect(id?:string):void;
-	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	validate(id?:string):boolean;
-	$drag(source:HTMLElement, ev:Event):string;
-	$dragHTML: WebixCallback;
-	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
-	$dragMark(context:any, ev:Event):boolean;
-	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
-	$dropAllow: WebixCallback;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: unitlistConfig;
-	name: string;
-	on_click: WebixCallback;
-	on_context: { [key: string]: any; };
-	on_dblclick: WebixCallback;
-	on_mouse_move: WebixCallback;
-	type: { [key: string]: any; };
-	types: { [key: string]: any; };
-}
-interface uploaderConfig{
-	align?: string;
-	animate?: any;
-	apiOnly?: boolean;
-	autosend?: boolean;
-	borderless?: boolean;
-	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	formData?: { [key: string]: any; };
-	getValue():string;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	hotkey?: string;
-	id?: string;
-	inputHeight?: number;
-	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
-	link?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	multiple?: boolean;
-	name?: string;
-	on?: any;
-	placeholder?: any;
-	popup?: any;
-	tabFocus?: boolean;
-	template?: string|WebixCallback;
-	tooltip?: string;
-	type?: string;
-	value?: string;
-	width?: number;
-}
-interface uploader extends webix.ui.baseview{
-	addDropZone(element:HTMLElement):void;
-	addFile(name:string, size:number, type?:string):void;
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	blur():void;
-	callEvent(name:string, params:any[]):boolean;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	fileDialog(content?:any):void;
-	focus():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getInputNode():HTMLElement;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getValue():string;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isUploaded():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	refresh():void;
-	render(id:string, data:any, type:string):void;
-	resize():void;
-	send(id:number|string|WebixCallback, details:any):void;
-	setValue(value:string):void;
-	show(force?:boolean, animation?:boolean):void;
-	stopUpload(id:string):void;
-	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$setValue(value:string):void;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: uploaderConfig;
-	name: string;
-	on_click: WebixCallback;
-	touchable: any;
-}
-interface videoConfig{
-	animate?: any;
-	borderless?: boolean;
-	container?: HTMLElement;
-	controls?: boolean;
-	css?: string;
-	disabled?: boolean;
-	gravity?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	src?: any;
-	width?: number;
-}
-interface video extends webix.ui.baseview{
-	adjust():void;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	define(property:string, value:any):void;
-	destructor():void;
-	disable():void;
-	enable():void;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	getVideo():void;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	resize():void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: videoConfig;
-	name: string;
-}
-interface windowConfig{
-	animate?: any;
-	autofit?: boolean;
-	autofocus?: boolean;
-	body?: string|webix.ui.baseview;
-	borderless?: boolean;
-	container?: HTMLElement;
-	css?: string;
-	disabled?: boolean;
-	fullscreen?: boolean;
-	gravity?: number;
-	head?: any;
-	headHeight?: number;
-	height?: number;
-	hidden?: boolean;
-	id?: string;
-	left?: number;
-	maxHeight?: number;
-	maxWidth?: number;
-	minHeight?: number;
-	minWidth?: number;
-	modal?: boolean;
-	move?: boolean;
-	on?: any;
-	padding?: any;
-	position?: string|WebixCallback;
-	relative?: string;
-	top?: number;
-	width?: number;
-	zIndex?: number;
-}
-interface window extends webix.ui.baseview{
-	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
-	bind(target:any, rule?:WebixCallback, format?:string):void;
-	blockEvent():void;
-	callEvent(name:string, params:any[]):boolean;
-	close():void;
-	define(property:string, value:any):void;
-	destructor():void;
-	detachEvent(id:string):void;
-	disable():void;
-	enable():void;
-	getBody():any;
-	getChildViews():any[];
-	getFormView():webix.ui.baseview;
-	getHead():any;
-	getNode():any;
-	getParentView():any;
-	getTopParentView():webix.ui.baseview;
-	hasEvent(name:string):boolean;
-	hide():void;
-	isEnabled():boolean;
-	isVisible():boolean;
-	mapEvent(map:any):void;
-	resize():void;
-	resizeChildren():void;
-	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	unbind():void;
-	unblockEvent():void;
-	$getSize():any[];
-	$height: number;
-	$scope: any;
-	$setSize(x:number, y:number):boolean;
-	$skin: any;
-	$view: HTMLElement;
-	$width: number;
-	config: windowConfig;
-	name: string;
-}
-
-}}
-
-declare function $$(id: string|Event|HTMLElement):webix.ui.baseview;
diff --git a/webix/webix-tests.ts b/webix/webix-tests.ts
index 128bc666c7..f1d66c47ce 100644
--- a/webix/webix-tests.ts
+++ b/webix/webix-tests.ts
@@ -64,3 +64,17 @@ data.config["test"]= 123;
 //mixins
 var t = webix.DataDriver.json;
 
+//each ui type has its own events and config options
+var tObj = <webix.ui.treetable> $$("table");
+tObj.attachEvent("onAfterOpen", () => false);
+tObj.config.threeState = false;
+
+var mObj = <webix.ui.submenu> $$("menu");
+mObj.attachEvent("onMenuItemClick", () => false);
+mObj.config.submenuConfig = {};
+
+//template cna be a function or a string
+mObj.config.template = "";
+mObj.config.template = (obj) => obj.str;
+
+
diff --git a/webix/webix.d.ts b/webix/webix.d.ts
index fb9d3b2db1..9c516654a1 100644
--- a/webix/webix.d.ts
+++ b/webix/webix.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Webix UI v2.4.0
+// Type definitions for Webix UI 3.3.0
 // Project: http://webix.com
 // Definitions by: Maksim Kozhukh <http://github.com/mkozhukh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -184,7 +184,7 @@ interface storage{
 
 function alert(text:string, callback:WebixCallback):HTMLElement;
 function animate(html_element:HTMLElement, animation:any):void;
-function attachEvent(type:string, functor:WebixCallback, id?:string):string;
+function attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 function bind(code:WebixCallback, master:any):WebixCallback;
 function blockEvent():void;
 function callEvent(name:string, params:any[]):boolean;
@@ -195,8 +195,8 @@ 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, event:string, handler:WebixCallback, master?:any):string;
-function eventRemove(id:string):void;
+function event(node:HTMLElement|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;
 function hasEvent(name:string):boolean;
@@ -209,7 +209,7 @@ function message(text:string):void;
 function modalbox(text:string, callback:WebixCallback):HTMLElement;
 function once(code:WebixCallback):void;
 function proto(target:any, mixin1?:any, mixinN?:any):any;
-function protoUI(target:any, view:any, mixin1?:any, mixinN?:any):any;
+function protoUI(target:any, view:any, mixin1:any, mixinN:any):any;
 function proxy(type:string, source:string):any;
 function ready(code:WebixCallback):void;
 function remote():void;
@@ -218,13 +218,17 @@ function send(url:string, values:any, method:string, target:string):void;
 function single(source:WebixCallback):WebixCallback;
 function template(template:string):WebixCallback;
 function toArray(array:any[]):any[];
+function toExcel(id:any, options:any):void;
 function toFunctor(name:string):WebixCallback;
 function toNode(id:string):HTMLElement;
+function toPDF(id:string, name:string):void;
+function toPNG(id:string, name:string):void;
 function type(config:any):void;
 function ui(config:any, parent?:any, replacement?:any):webix.ui.baseview;
-function uid():string;
+function uid():number;
 function unblockEvent():void;
 function wrap(target:WebixCallback, source:WebixCallback):WebixCallback;
+
 var codebase: string;
 var name: string;
 var version: string;
@@ -243,40 +247,34 @@ var rules:webix.rules;
 var storage:webix.storage;
 
 interface ActiveContent{
-	}
+}
 var ActiveContent:ActiveContent;
-
 interface AtomDataLoader{
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	parse(data:any, type:string):void;
 }
 var AtomDataLoader:AtomDataLoader;
-
 interface AtomRender{
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 }
 var AtomRender:AtomRender;
-
 interface AutoTooltip{
-	}
+}
 var AutoTooltip:AutoTooltip;
-
 interface BaseBind{
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	unbind():void;
 }
 var BaseBind:BaseBind;
-
 interface BindSource{
 	addBind(source:any, rule:string, format:string):void;
-	getBindData(key:string, update:boolean):void;
+	getBindData(key:string|number, update:boolean):void;
 	removeBind(source:any):void;
 	saveBatch(func:WebixCallback):void;
-	setBindData(data:any, key:string):void;
+	setBindData(data:any, key:string|number):void;
 }
 var BindSource:BindSource;
-
 interface Canvas{
 	clearCanvas():void;
 	getCanvas(context:string):any;
@@ -287,85 +285,91 @@ interface Canvas{
 	toggleCanvas():void;
 }
 var Canvas:Canvas;
-
+interface CodeParser{
+	collapseNames(obj:any):{ [key: string]: any; };
+	expandNames(obj:{ [key: string]: any; }):any;
+}
+var CodeParser:CodeParser;
 interface CollectionBind{
 	getCursor():number;
 	refreshCursor():void;
-	setCursor(cursor:string):void;
+	setCursor(cursor:string|number):void;
 }
 var CollectionBind:CollectionBind;
-
 interface ContextHelper{
 	attachTo(view:any):void;
 	getContext():any;
+	setContext(context:any):void;
 }
 var ContextHelper:ContextHelper;
-
 interface CopyPaste{
-	}
+}
 var CopyPaste:CopyPaste;
-
 interface CustomScroll{
 	enable(html_node:HTMLElement|webix.ui.baseview):void;
 	init():void;
+	resize():void;
 	scrollStep: number;
 }
 var CustomScroll:CustomScroll;
-
 interface DataCollection{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addBind(source:any, rule:string, format:string):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearValidation():void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	define(property:string, value:any):void;
 	destructor():void;
 	detachEvent(id:string):void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBindData(key:string, update:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getBindData(key:string|number, update:boolean):void;
 	getCursor():number;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getPrevId(id:string, step:number):string;
+	getFirstId():string|number;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getPrevId(id:string|number, step:number):string|number;
 	hasEvent(name:string):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
 	mapEvent(map:any):void;
+	move(sid:string, tindex:number, tobj?:any, details?:any):string;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
+	refresh(id?:string|number):void;
 	refreshCursor():void;
-	remove(id:string):void;
+	remove(id:string|number):void;
 	removeBind(source:any):void;
 	saveBatch(func:WebixCallback):void;
 	serialize():any;
-	setBindData(data:any, key:string):void;
-	setCursor(cursor:string):void;
+	setBindData(data:any, key:string|number):void;
+	setCursor(cursor:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
 	config: { [key: string]: any; };
 	name: string;
 }
-interface DataCollectionFactory{
-	new():DataCollection;
-}
-var DataCollection:DataCollectionFactory;
 
 interface DataDriver{
 	csv: any;
+	excel: string;
 	html: any;
 	htmltable: any;
 	jsarray: any;
@@ -373,52 +377,49 @@ interface DataDriver{
 	xml: any;
 }
 var DataDriver:DataDriver;
-
 interface DataLoader{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	clearAll():void;
 	count():number;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getPrevId(id:string, step:number):string;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getFirstId():string|number;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getPrevId(id:string|number, step:number):string|number;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	serialize():any;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 }
 var DataLoader:DataLoader;
-
 interface DataMarks{
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	clearCss(css:string, silent?:boolean):void;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
 }
 var DataMarks:DataMarks;
-
 interface DataMove{
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 }
 var DataMove:DataMove;
-
 interface DataProcessor{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	attachProgress(start:WebixCallback, end:WebixCallback, error:WebixCallback):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -426,7 +427,7 @@ interface DataProcessor{
 	define(property:string, value:any):void;
 	detachEvent(id:string):void;
 	escape(value:string):string;
-	getItemState(itemId:string):any;
+	getItemState(itemId:string|number):any;
 	getState():string|boolean;
 	hasEvent(name:string):boolean;
 	ignore(code:WebixCallback, master:any):void;
@@ -435,18 +436,17 @@ interface DataProcessor{
 	on():void;
 	processResult(data:any):void;
 	reset():void;
-	save(id:string, operation:string):void;
+	save(id:string|number, operation:string):void;
 	send():void;
-	setItemState(itemId:string, state:boolean):void;
+	setItemState(itemId:string|number, state:boolean):void;
 	unblockEvent():void;
-	validate():boolean;
+	validate(mode?:any):boolean;
 	config: { [key: string]: any; };
 	name: string;
 }
 var DataProcessor:DataProcessor;
-
 interface DataRecord{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -455,10 +455,10 @@ interface DataRecord{
 	getValues():any;
 	hasEvent(name:string):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	mapEvent(map:any):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
+	refresh(id?:string|number):void;
 	setValues(values:any, update?:boolean):void;
 	unbind():void;
 	unblockEvent():void;
@@ -466,46 +466,45 @@ interface DataRecord{
 	name: string;
 }
 var DataRecord:DataRecord;
-
 interface DataState{
 	getState():any;
 	setState(state:any):void;
 }
 var DataState:DataState;
-
 interface DataStore{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addMark(id:string, name:string, css?:boolean, value?:any):any;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
-	changeId(old:string, newid:string):void;
+	changeId(old:string|number, newid:string|number):void;
 	clearAll():void;
 	clearMark(name:string):void;
 	count():number;
 	destructor():void;
 	detachEvent(id:string):void;
 	each(method:WebixCallback, master?:any, all?:boolean):void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getIndexRange(from:string, to:string):any[];
-	getItem(id:string):any;
-	getLastId():string;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getFirstId():string|number;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getIndexRange(from:string|number, to:string|number):any[];
+	getItem(id:string|number):any;
+	getLastId():string|number;
 	getMark(id:string, mark_name:string):any;
-	getNextId(id:string, step:number):string;
-	getPrevId(id:string, step:number):string;
-	getRange(from:string, to:string):any[];
+	getNextId(id:string|number, step:number):string|number;
+	getPrevId(id:string|number, step:number):string|number;
+	getRange(from:string|number, to:string|number):any[];
 	hasEvent(name:string):boolean;
-	id(item:any):string;
+	id(item:any):string|number;
 	importData(source:webix.ui.baseview):void;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
 	provideApi(target:any, eventable:boolean):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeMark(id:string, name:string, css:boolean):void;
 	scheme(config:any):void;
 	serialize():any;
@@ -515,16 +514,15 @@ interface DataStore{
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unblockEvent():void;
 	unsync():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	driver: any;
 	name: string;
 	order: any[];
 	pull: any;
 }
 var DataStore:DataStore;
-
 interface DataValue{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -540,7 +538,6 @@ interface DataValue{
 	name: string;
 }
 var DataValue:DataValue;
-
 interface Date{
 	add(date:any, inc:number, mode:string):any;
 	copy(date:any):any;
@@ -560,15 +557,13 @@ interface Date{
 	startOnMonday: boolean;
 }
 var Date:Date;
-
 interface Destruction{
 	destructor():void;
 }
 var Destruction:Destruction;
-
 interface DragControl{
-	addDrag(node:string|HTMLElement, ctrl:any):void;
-	addDrop(node:string|HTMLElement, ctrl:any, master_mode:boolean):void;
+	addDrag(node:string|number|HTMLElement, ctrl:any):void;
+	addDrop(node:string|number|HTMLElement, ctrl:any, master_mode:boolean):void;
 	createDrag(event:Event):void;
 	destroyDrag():void;
 	getContext():any;
@@ -584,26 +579,23 @@ interface DragControl{
 	top: number;
 }
 var DragControl:DragControl;
-
 interface DragItem{
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
 }
 var DragItem:DragItem;
-
 interface DragOrder{
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragPos: WebixCallback;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 }
 var DragOrder:DragOrder;
-
 interface EditAbility{
 	edit(id:any):void;
 	editCancel():void;
@@ -613,12 +605,11 @@ interface EditAbility{
 	getEditState():any;
 	getEditor(id?:string):any;
 	getEditorValue():string;
-	validateEditor(id?:string):boolean;
+	validateEditor(id?:string|number):boolean;
 }
 var EditAbility:EditAbility;
-
 interface EventSystem{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	detachEvent(id:string):void;
@@ -627,13 +618,11 @@ interface EventSystem{
 	unblockEvent():void;
 }
 var EventSystem:EventSystem;
-
 interface Group{
 	group(config:any, mode:boolean):void;
 	ungroup(mode:boolean):void;
 }
 var Group:Group;
-
 interface GroupMethods{
 	any(property:string, data:any):void;
 	count(property:string, data:any):void;
@@ -643,41 +632,34 @@ interface GroupMethods{
 	sum(property:string, data:any):void;
 }
 var GroupMethods:GroupMethods;
-
 interface GroupStore{
 	group(stats:any):void;
 	ungroup():void;
 }
 var GroupStore:GroupStore;
-
 interface HtmlMap{
-	addPoly(id:string, points:any[]):void;
-	addRect(id:string, points:any[], userdata?:string):void;
-	addSector(id:string, aplha0:number, aplha1:number, x:number, y:number, R:number, ky:number):void;
+	addPoly(id:string|number, points:any[]):void;
+	addRect(id:string|number, points:any[], userdata?:string):void;
+	addSector(id:string|number, aplha0:number, aplha1:number, x:number, y:number, R:number, ky:number):void;
 	render(html:HTMLElement):void;
 }
 var HtmlMap:HtmlMap;
-
 interface IdSpace{
-	innerId(id:string):string;
+	innerId(id:string|number):string|number;
 	ui(view:any):webix.ui.baseview;
 	$$: any;
 }
 var IdSpace:IdSpace;
-
 interface KeysNavigation{
 	moveSelection(direction:string):void;
 }
 var KeysNavigation:KeysNavigation;
-
 interface MapCollection{
-	}
+}
 var MapCollection:MapCollection;
-
 interface Modality{
-	}
+}
 var Modality:Modality;
-
 interface MouseEvents{
 	on_click: WebixCallback;
 	on_context: { [key: string]: any; };
@@ -685,34 +667,28 @@ interface MouseEvents{
 	on_mouse_move: WebixCallback;
 }
 var MouseEvents:MouseEvents;
-
 interface Movable{
-	}
+}
 var Movable:Movable;
-
 interface NavigationButtons{
-	}
+}
 var NavigationButtons:NavigationButtons;
-
 interface Number{
 	format(value:number, config:any):string;
 	numToStr(config:any):WebixCallback;
 }
 var Number:Number;
-
 interface OverlayBox{
 	hideOverlay():void;
 	showOverlay():void;
 }
 var OverlayBox:OverlayBox;
-
 interface PagingAbility{
 	getPage():number;
 	getPager():any;
 	setPage(page:number):void;
 }
 var PagingAbility:PagingAbility;
-
 interface PowerArray{
 	each(functor:WebixCallback, master:any):void;
 	filter(functor:WebixCallback, master:any):any[];
@@ -723,64 +699,62 @@ interface PowerArray{
 	removeAt(pos:number, len:number):void;
 }
 var PowerArray:PowerArray;
-
 interface ProgressBar{
 	hideProgress():void;
 	showProgress(config?:any):void;
 }
 var ProgressBar:ProgressBar;
-
 interface RecordBind{
-	}
+}
 var RecordBind:RecordBind;
-
 interface RenderStack{
 	customize(obj:any):void;
-	getItemNode(id:string):void;
-	locate(e:Event):string;
-	render(id:string, data:any, type:string):void;
-	showItem(id:string):void;
+	getItemNode(id:string|number):void;
+	locate(e:Event):string|number;
+	render(id:string|number, data:any, type:string):void;
+	showItem(id:string|number):void;
 	type: { [key: string]: any; };
 	types: { [key: string]: any; };
 }
 var RenderStack:RenderStack;
-
 interface Scrollable{
 	getScrollState():any;
 	scrollTo(x:number, y:number):void;
 }
 var Scrollable:Scrollable;
-
 interface SelectionModel{
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
-	isSelected(id:string):boolean;
+	getSelectedItem(as_array:boolean):any;
+	isSelected(id:string|number):boolean;
 	select(id:string|any[], preserve:boolean):void;
 	selectAll(from?:string, to?:string):void;
 	unselect(id?:string):void;
 	unselectAll():void;
 }
 var SelectionModel:SelectionModel;
-
 interface Settings{
 	define(property:string, value:any):void;
 	config: { [key: string]: any; };
 	name: string;
 }
 var Settings:Settings;
-
 interface SingleRender{
 	customize(obj:any):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	type: { [key: string]: any; };
 }
 var SingleRender:SingleRender;
-
+interface Sparklines{
+	template(item:any, common:string, data:any[], column:any, index:number):string;
+	paddingX: number;
+	paddingY: number;
+	radius: number;
+}
+var Sparklines:Sparklines;
 interface TablePaste{
-	}
+}
 var TablePaste:TablePaste;
-
 interface Touch{
 	disable():void;
 	enable():void;
@@ -789,143 +763,140 @@ interface Touch{
 	config: any;
 }
 var Touch:Touch;
-
 interface TreeAPI{
-	close(id:string):void;
+	close(id:string|number):void;
 	closeAll():void;
 	getOpenItems():any[];
 	getState():any;
-	isBranchOpen(id:string):boolean;
-	open(id:string):void;
+	isBranchOpen(id:string|number):boolean;
+	open(id:string|number, show?:boolean):void;
 	openAll():void;
 	setState(state:any):void;
 }
 var TreeAPI:TreeAPI;
-
 interface TreeClick{
 	webix_tree_checkbox(obj:any, common:{ [key: string]: any; }):string;
 	webix_tree_close(obj:any, common:{ [key: string]: any; }):string;
 	webix_tree_open(obj:any, common:{ [key: string]: any; }):string;
 }
 var TreeClick:TreeClick;
-
 interface TreeCollection{
 	add(obj:any, index?:number, parentId?:string):string;
 	addBind(source:any, rule:string, format:string):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:string, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearValidation():void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	define(property:string, value:any):void;
 	destructor():void;
 	detachEvent(id:string):void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBindData(key:string, update:boolean):void;
-	getBranchIndex(id:string, parent?:string):number;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getBindData(key:string|number, update:boolean):void;
+	getBranchIndex(id:string|number, parent?:string|number):number;
 	getCursor():number;
-	getFirstChildId(id:string):string;
-	getFirstId():string;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
-	getParentId(id:string):string;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
+	getFirstChildId(id:string|number):string;
+	getFirstId():string|number;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getNextSiblingId(id:string|number):string|number;
+	getParentId(id:string|number):string|number;
+	getPrevId(id:string|number, step:number):string|number;
+	getPrevSiblingId(id:string|number):string|number;
 	hasEvent(name:string):boolean;
-	isBranch(id:string):boolean;
+	isBranch(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	loadBranch(id:string|number, callback:WebixCallback, url:string):void;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
 	mapEvent(map:any):void;
+	move(sid:string, tindex:number, tobj?:any, details?:any):string;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
+	refresh(id?:string|number):void;
 	refreshCursor():void;
-	remove(id:string):void;
+	remove(id:string|number):void;
 	removeBind(source:any):void;
 	saveBatch(func:WebixCallback):void;
 	serialize():any;
-	setBindData(data:any, key:string):void;
-	setCursor(cursor:string):void;
+	setBindData(data:any, key:string|number):void;
+	setCursor(cursor:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
 	config: { [key: string]: any; };
 	name: string;
 }
 var TreeCollection:TreeCollection;
-
 interface TreeDataLoader{
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
+	loadBranch(id:string|number, callback:WebixCallback, url:string):void;
 }
 var TreeDataLoader:TreeDataLoader;
-
 interface TreeDataMove{
-	copy(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	move(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
+	copy(sid:string|number, tindex:number, tobj?:webix.ui.baseview, details?:any):string|number;
+	move(sid:string|number, tindex:number, tobj?:webix.ui.baseview, details?:any):string|number;
 	$dropAllow: WebixCallback;
 }
 var TreeDataMove:TreeDataMove;
-
 interface TreeRenderStack{
-	getItemNode(id:string):void;
-	getItemNode(id:string):HTMLElement;
+	getItemNode(id:string|number):void;
+	render(id:string|number, data:any, type:string):void;
 }
 var TreeRenderStack:TreeRenderStack;
-
 interface TreeStateCheckbox{
-	checkAll(id?:string):void;
+	checkAll(id?:string|number):void;
 	checkItem(id:string):void;
 	getChecked():any[];
-	isChecked(id:string):boolean;
-	uncheckAll(id?:string):void;
+	isChecked(id:string|number):boolean;
+	uncheckAll(id?:string|number):void;
 	uncheckItem(id:string):void;
 }
 var TreeStateCheckbox:TreeStateCheckbox;
-
 interface TreeStore{
 	add(obj:any, index?:number, parentId?:string):string;
-	changeId(old:string, newid:string):void;
+	changeId(old:string|number, newid:string|number):void;
 	clearAll():void;
 	count():number;
 	each(code:WebixCallback, master:any, all:boolean, pid:string):void;
 	eachChild(pid:string, code:WebixCallback, master?:any, all?:boolean):void;
+	eachLeaf(pid:string, code:WebixCallback):void;
 	eachOpen(code:WebixCallback, master?:any, pid?:string):void;
 	eachSubItem(pid:string, code:WebixCallback):void;
 	getBranch(id:string):any[];
-	getBranchIndex(id:string, parent?:string):number;
-	getFirstChildId(id:string):string;
-	getNextSiblingId(id:any):string;
-	getParentId(id:string):string;
-	getPrevSiblingId(id:any):string;
+	getBranchIndex(id:string|number, parent?:string|number):number;
+	getFirstChildId(id:string|number):string;
+	getNextSiblingId(id:string|number):string|number;
+	getParentId(id:string|number):string|number;
+	getPrevSiblingId(id:string|number):string|number;
 	getTopRange():any[];
-	isBranch(id:string):boolean;
+	isBranch(id:string|number):boolean;
 	provideApi(target:any, eventable:boolean):void;
-	remove(id:string):void;
+	remove(id:string|number):void;
 	serialize():any;
 	name: string;
 }
 var TreeStore:TreeStore;
-
 interface TreeTableClick{
-	}
+}
 var TreeTableClick:TreeTableClick;
-
 interface TreeTablePaste{
 	insert(data:any[]):void;
 }
 var TreeTablePaste:TreeTablePaste;
-
 interface TreeType{
 	checkbox(obj:any, common:any):string;
 	folder(obj:any, common:any):string;
@@ -933,49 +904,49 @@ interface TreeType{
 	space(obj:any, common:any):string;
 }
 var TreeType:TreeType;
-
 interface UIExtension{
-	}
+}
 var UIExtension:UIExtension;
-
 interface UIManager{
 	addHotKey(key:string, handler:WebixCallback, obj?:any):void;
-	canFocus(id:string):boolean;
+	applyChanges():void;
+	canFocus(id:string|number):boolean;
 	destructor():void;
 	getFocus():webix.ui.baseview;
 	getNext(view:any):any;
 	getPrev(view:any):any;
 	getState(id:string, childs:boolean):any;
-	getTop(id:string):any;
-	hasFocus(id:string):boolean;
+	getTop(id:string|number):any;
+	hasFocus(id:string|number):boolean;
 	removeHotKey(key:string, handler?:WebixCallback, obj?:any):void;
-	setFocus(id:string):void;
+	setFocus(id:string|number):void;
 	setState(state:any):void;
 }
 var UIManager:UIManager;
-
+interface Undo{
+	ignoreUndo(functor:WebixCallback):void;
+	removeUndo(id:string):void;
+	undo(id:string):void;
+}
+var Undo:Undo;
 interface UploadDriver{
 	flash: any;
 	html5: any;
 }
 var UploadDriver:UploadDriver;
-
 interface ValidateCollection{
 	clearValidation():void;
 	validate(id?:string):boolean;
 }
 var ValidateCollection:ValidateCollection;
-
 interface ValidateData{
 	clearValidation():void;
-	validate():boolean;
+	validate(mode?:any):boolean;
 }
 var ValidateData:ValidateData;
-
 interface ValueBind{
-	}
+}
 var ValueBind:ValueBind;
-
 interface Values{
 	clear():void;
 	focus(item:string):void;
@@ -983,23 +954,27 @@ interface Values{
 	getDirtyValues():any;
 	getValues(details?:any):{ [key: string]: any; };
 	isDirty():boolean;
+	markInvalid(name:string, state?:boolean|string):void;
 	setDirty(mark?:boolean):void;
 	setValues(values:any, update?:boolean):void;
 }
 var Values:Values;
-
 interface VirtualRenderStack{
-	getItemNode(id:string):void;
-	render(id:string, data:any, type:string):void;
-	showItem(id:string):void;
+	getItemNode(id:string|number):void;
+	render(id:string|number, data:any, type:string):void;
+	showItem(id:string|number):void;
 }
 var VirtualRenderStack:VirtualRenderStack;
 
 
+interface DataCollectionFactory {
+	new (): DataCollection;
+}
+var DataCollection: DataCollectionFactory;
+
+
 namespace ui {
 
-
-
 function delay(config:any):void;
 function fullScreen():void;
 function hasMethod(name:string, method_name:string):boolean;
@@ -1012,13 +987,13 @@ interface baselayoutConfig{
 	animate?: any;
 	borderless?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -1029,10 +1004,11 @@ interface baselayoutConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type baselayoutEventName ='onBindRequest'|'onDestruct';
 interface baselayout extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:baselayoutEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1053,14 +1029,15 @@ interface baselayout extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
 	show(force?:boolean, animation?:boolean):void;
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -1072,19 +1049,20 @@ interface baselayout extends webix.ui.baseview{
 interface baseviewConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	width?: number;
 }
+type baseviewEventName ='onBindRequest'|'onDestruct';
 interface baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -1103,7 +1081,8 @@ interface baseview{
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -1112,21 +1091,115 @@ interface baseview{
 	config: baseviewConfig;
 	name: string;
 }
+interface checksuggestConfig{
+	animate?: any;
+	autofit?: boolean;
+	autofocus?: boolean;
+	body?: string|webix.ui.baseview;
+	borderless?: boolean;
+	button?: boolean;
+	buttonText?: string;
+	container?: string|HTMLElement;
+	css?: string;
+	disabled?: boolean;
+	filter?: WebixCallback;
+	fitMaster?: boolean;
+	gravity?: number;
+	head?: any;
+	headHeight?: number;
+	height?: number;
+	hidden?: boolean;
+	id?: string|number;
+	input?: HTMLElement|string;
+	keyPressTimeout?: number;
+	left?: number;
+	master?: webix.ui.baseview;
+	maxHeight?: number;
+	maxWidth?: number;
+	minHeight?: number;
+	minWidth?: number;
+	modal?: boolean;
+	move?: boolean;
+	on?: any;
+	padding?: any;
+	position?: string|WebixCallback;
+	relative?: string;
+	resize?: boolean;
+	separator?: string;
+	template?: string|WebixTemplate;
+	textValue?: string;
+	toFront?: boolean;
+	top?: number;
+	type?: string;
+	value?: string|number;
+	width?: number;
+	zIndex?: number;
+}
+type checksuggestEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValueSuggest'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
+interface checksuggest extends webix.ui.baseview{
+	adjust():void;
+	attachEvent(type:checksuggestEventName, functor:WebixCallback, id?:string):string|number;
+	bind(target:any, rule?:WebixCallback, format?:string):void;
+	blockEvent():void;
+	callEvent(name:string, params:any[]):boolean;
+	close():void;
+	define(property:string, value:any):void;
+	destructor():void;
+	detachEvent(id:string):void;
+	disable():void;
+	enable():void;
+	getBody():any;
+	getButton():webix.ui.baseview;
+	getChildViews():any[];
+	getFormView():webix.ui.baseview;
+	getHead():any;
+	getItemText(id:string|number):string;
+	getList():webix.ui.baseview;
+	getMasterValue():any;
+	getNode():any;
+	getParentView():any;
+	getSuggestion():string;
+	getTopParentView():webix.ui.baseview;
+	getValue():string|number;
+	hasEvent(name:string):boolean;
+	hide():void;
+	isEnabled():boolean;
+	isVisible():boolean;
+	linkInput(input:HTMLElement):void;
+	mapEvent(map:any):void;
+	resize():void;
+	resizeChildren():void;
+	setMasterValue(value:any):void;
+	setPosition(x:number, y:number):void;
+	setValue(value:string|number):void;
+	show(force?:boolean, animation?:boolean):void;
+	unbind():void;
+	unblockEvent():void;
+
+	$getSize: any[];
+	$height: number;
+	$scope: any;
+	$setSize(x:number, y:number):boolean;
+	$skin: any;
+	$view: HTMLElement;
+	$width: number;
+	config: checksuggestConfig;
+	name: string;
+}
 interface protoConfig{
 	animate?: any;
 	borderless?: boolean;
 	click?: string|WebixCallback;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datathrottle?: number;
 	datatype?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -1144,11 +1217,12 @@ interface protoConfig{
 	url?: string;
 	width?: number;
 }
+type protoEventName ='onAfterAdd'|'onAfterDelete'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSort'|'onBeforeAdd'|'onBeforeDelete'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onFocus'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface proto extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:protoEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1162,49 +1236,51 @@ interface proto extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getTopParentView():webix.ui.baseview;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	serialize():any;
 	setPage(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1223,13 +1299,14 @@ interface resizeareaConfig{
 	dir?: string;
 	eventPos?: number;
 	height?: number;
-	id?: string;
+	id?: string|number;
 	on?: any;
 	start?: number;
 	width?: number;
 }
-interface resizearea{
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+type resizeareaEventName ='onResize'|'onResizeEnd';
+interface resizearea extends webix.ui.baseview{
+	attachEvent(type:resizeareaEventName, functor:WebixCallback, id?:string):string|number;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	define(property:string, value:any):void;
@@ -1237,25 +1314,27 @@ interface resizearea{
 	hasEvent(name:string):boolean;
 	mapEvent(map:any):void;
 	unblockEvent():void;
+
 	config: resizeareaConfig;
 	name: string;
 }
 interface viewConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	width?: number;
 }
+type viewEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface view extends webix.ui.baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -1274,7 +1353,8 @@ interface view extends webix.ui.baseview{
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1285,8 +1365,8 @@ interface view extends webix.ui.baseview{
 	name: string;
 }
 interface vscrollConfig{
-	container?: HTMLElement;
-	id?: string;
+	container?: string|HTMLElement;
+	id?: string|number;
 	on?: any;
 	scroll?: string;
 	scrollHeight?: number;
@@ -1297,9 +1377,10 @@ interface vscrollConfig{
 	scrollWidth?: number;
 	zoom?: number;
 }
+type vscrollEventName ='onScroll';
 interface vscroll extends webix.ui.baseview{
 	activeArea(node:HTMLElement):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:vscrollEventName, functor:WebixCallback, id?:string):string|number;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	define(property:string, value:any):void;
@@ -1311,6 +1392,7 @@ interface vscroll extends webix.ui.baseview{
 	scrollTo(pos:number):void;
 	sizeTo(size:number):void;
 	unblockEvent():void;
+
 	config: vscrollConfig;
 	name: string;
 }
@@ -1319,13 +1401,13 @@ interface accordionConfig{
 	borderless?: boolean;
 	collapsed?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	margin?: number;
 	maxHeight?: number;
@@ -1344,10 +1426,11 @@ interface accordionConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type accordionEventName ='onAfterCollapse'|'onAfterExpand'|'onBindRequest'|'onDestruct';
 interface accordion extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:accordionEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1368,14 +1451,15 @@ interface accordion extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
 	show(force?:boolean, animation?:boolean):void;
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -1386,10 +1470,10 @@ interface accordion extends webix.ui.baseview{
 }
 interface accordionitemConfig{
 	animate?: any;
-	body?: string|webix.ui.baseview;
+	body?: any;
 	borderless?: boolean;
 	collapsed?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -1399,7 +1483,7 @@ interface accordionitemConfig{
 	headerHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -1412,9 +1496,10 @@ interface accordionitemConfig{
 	onMouseMove?: WebixCallback;
 	width?: number;
 }
+type accordionitemEventName ='onAfterContextMenu'|'onAfterScroll'|'onBeforeContextMenu'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface accordionitem extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:accordionitemEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1440,7 +1525,8 @@ interface accordionitem extends webix.ui.baseview{
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1458,13 +1544,13 @@ interface barcodeConfig{
 	animate?: any;
 	borderless?: boolean;
 	color?: string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -1472,10 +1558,11 @@ interface barcodeConfig{
 	paddingX?: number;
 	paddingY?: number;
 	textHeight?: number;
-	type?: any;
+	type?: string;
 	value?: string;
 	width?: number;
 }
+type barcodeEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface barcode extends webix.ui.baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -1497,7 +1584,8 @@ interface barcode extends webix.ui.baseview{
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1511,17 +1599,17 @@ interface barcode extends webix.ui.baseview{
 interface buttonConfig{
 	align?: string;
 	animate?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputWidth?: number;
 	label?: string;
@@ -1533,17 +1621,17 @@ interface buttonConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
 	type?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type buttonEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface button extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:buttonEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -1567,16 +1655,18 @@ interface button extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
+	$renderInput(config:any):HTMLElement;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -1586,7 +1676,7 @@ interface button extends webix.ui.baseview{
 	config: buttonConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface calendarConfig{
 	animate?: any;
@@ -1595,10 +1685,10 @@ interface calendarConfig{
 	calendarHeader?: string;
 	calendarTime?: string;
 	calendarWeekHeader?: string;
-	cellHeight?: number;
-	container?: HTMLElement;
+	cellHeight?: number|string;
+	container?: string|HTMLElement;
 	css?: string;
-	date?: any;
+	date?: Date|string;
 	dayTemplate?: WebixCallback;
 	disabled?: boolean;
 	events?: WebixCallback;
@@ -1607,12 +1697,14 @@ interface calendarConfig{
 	height?: number;
 	hidden?: boolean;
 	icons?: any;
-	id?: string;
+	id?: string|number;
 	maxDate?: Date|string;
 	maxHeight?: number;
+	maxTime?: string;
 	maxWidth?: number;
 	minDate?: Date|string;
 	minHeight?: number;
+	minTime?: string;
 	minWidth?: number;
 	minuteStep?: number;
 	monthSelect?: boolean;
@@ -1632,9 +1724,10 @@ interface calendarConfig{
 	weekNumber?: boolean;
 	width?: number;
 }
+type calendarEventName ='onAfterContextMenu'|'onAfterDateSelect'|'onAfterMonthChange'|'onAfterRender'|'onAfterScroll'|'onAfterZoom'|'onBeforeContextMenu'|'onBeforeDateSelect'|'onBeforeMonthChange'|'onBeforeRender'|'onBeforeZoom'|'onBindRequest'|'onBlur'|'onChange'|'onDateClear'|'onDateSelect'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTodaySet'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface calendar extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:calendarEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1655,18 +1748,19 @@ interface calendar extends webix.ui.baseview{
 	hide():void;
 	isEnabled():boolean;
 	isVisible():boolean;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
-	selectDate(date:any):void;
+	selectDate(date:any, mode:boolean):void;
 	setValue(date:any):void;
 	show(force?:boolean, animation?:boolean):void;
 	showCalendar(date:any):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1684,13 +1778,13 @@ interface carouselConfig{
 	animate?: any;
 	borderless?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -1702,10 +1796,11 @@ interface carouselConfig{
 	type?: string;
 	width?: number;
 }
+type carouselEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface carousel extends webix.ui.baseview{
 	adjust():void;
-	adjustScroll(matrix:any):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	adjustScroll():void;
+	attachEvent(type:carouselEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1736,7 +1831,8 @@ interface carousel extends webix.ui.baseview{
 	showPrev():void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1755,10 +1851,9 @@ interface chartConfig{
 	borderless?: boolean;
 	cant?: number;
 	color?: string|WebixCallback;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datathrottle?: number;
 	datatype?: string;
 	disableLines?: boolean;
@@ -1770,7 +1865,7 @@ interface chartConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	item?: any;
 	label?: string|WebixCallback;
 	labelOffset?: number;
@@ -1799,7 +1894,7 @@ interface chartConfig{
 	save?: string;
 	scale?: string;
 	scheme?: any;
-	series?: any[];
+	series?: any;
 	shadow?: boolean;
 	tooltip?: any;
 	type?: string;
@@ -1813,11 +1908,12 @@ interface chartConfig{
 	yAxis?: any;
 	yValue?: string;
 }
+type chartEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface chart extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addSeries(obj:any):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:chartEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -1829,19 +1925,20 @@ interface chart extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getTopParentView():webix.ui.baseview;
 	group(config:any, mode:boolean):void;
 	hasEvent(name:string):boolean;
@@ -1849,15 +1946,15 @@ interface chart extends webix.ui.baseview{
 	hideSeries(series:string):void;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeAllSeries():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	serialize():any;
 	show(force?:boolean, animation?:boolean):void;
@@ -1867,8 +1964,9 @@ interface chart extends webix.ui.baseview{
 	unbind():void;
 	unblockEvent():void;
 	ungroup(mode:boolean):void;
-	updateItem(id:string, data:any):void;
-	$getSize():any[];
+	updateItem(id:string|number, data:any):void;
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -1887,14 +1985,14 @@ interface chart extends webix.ui.baseview{
 interface checkboxConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	checkValue?: string;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	customCheckbox?: boolean;
 	disabled?: boolean;
@@ -1902,13 +2000,14 @@ interface checkboxConfig{
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
+	labelRight?: string;
 	labelWidth?: number;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -1916,26 +2015,23 @@ interface checkboxConfig{
 	minWidth?: number;
 	name?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
+	popup?: string;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
 	uncheckValue?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type checkboxEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface checkbox extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:checkboxEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -1959,8 +2055,9 @@ interface checkbox extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
@@ -1968,13 +2065,14 @@ interface checkbox extends webix.ui.baseview{
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -1984,19 +2082,19 @@ interface checkbox extends webix.ui.baseview{
 	config: checkboxConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface colorboardConfig{
 	animate?: any;
 	borderless?: boolean;
 	cols?: number;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxLightness?: number;
 	maxWidth?: number;
@@ -2010,9 +2108,10 @@ interface colorboardConfig{
 	value?: string;
 	width?: number;
 }
+type colorboardEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface colorboard extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:colorboardEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -2033,16 +2132,18 @@ interface colorboard extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	setValue(value:string):string;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
+	$setValue(value:string):void;
 	$skin: any;
 	$view: HTMLElement;
 	$width: number;
@@ -2052,13 +2153,13 @@ interface colorboard extends webix.ui.baseview{
 interface colorpickerConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	editable?: boolean;
@@ -2067,13 +2168,12 @@ interface colorpickerConfig{
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	icon?: string;
 	icons?: boolean;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -2084,27 +2184,26 @@ interface colorpickerConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	stringResult?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	timeIcon?: string;
 	timepicker?: boolean;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type colorpickerEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface colorpicker extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:colorpickerEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -2130,21 +2229,23 @@ interface colorpicker extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -2154,18 +2255,18 @@ interface colorpicker extends webix.ui.baseview{
 	config: colorpickerConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface comboConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -2173,11 +2274,11 @@ interface comboConfig{
 	hidden?: boolean;
 	hotkey?: string;
 	icon?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -2189,26 +2290,26 @@ interface comboConfig{
 	on?: any;
 	options?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	popupWidth?: number;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	text?: string;
 	tooltip?: string;
 	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type comboEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface combo extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:comboEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -2222,6 +2323,7 @@ interface combo extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getInputNode():HTMLElement;
+	getList():webix.ui.baseview;
 	getNode():any;
 	getParentView():any;
 	getPopup():webix.ui.baseview;
@@ -2234,21 +2336,23 @@ interface combo extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -2258,7 +2362,7 @@ interface combo extends webix.ui.baseview{
 	config: comboConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface contextConfig{
 	animate?: any;
@@ -2266,7 +2370,7 @@ interface contextConfig{
 	autofocus?: boolean;
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -2274,7 +2378,7 @@ interface contextConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	left?: number;
 	master?: string;
 	maxHeight?: number;
@@ -2287,13 +2391,16 @@ interface contextConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
+	toFront?: boolean;
 	top?: number;
 	width?: number;
 	zIndex?: number;
 }
+type contextEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface context extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:contextEventName, functor:WebixCallback, id?:string):string|number;
 	attachTo(view:any):void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
@@ -2319,11 +2426,13 @@ interface context extends webix.ui.baseview{
 	mapEvent(map:any):void;
 	resize():void;
 	resizeChildren():void;
+	setContext(context:any):void;
 	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
+	show(node?:HTMLElement, position?:any, point?:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+	show(force:boolean,animation:boolean):void;
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -2343,7 +2452,7 @@ interface contextmenuConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -2358,7 +2467,7 @@ interface contextmenuConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	layout?: string;
 	left?: number;
 	master?: string;
@@ -2369,19 +2478,21 @@ interface contextmenuConfig{
 	modal?: boolean;
 	mouseEventDelay?: number;
 	move?: boolean;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
 	onContext?: { [key: string]: any; };
 	onDblClick?: WebixCallback;
 	onMouseMove?: WebixCallback;
+	openAction?: string;
 	padding?: any;
 	pager?: any;
 	position?: string|WebixCallback;
 	ready?: WebixCallback;
 	relative?: string;
 	removeMissed?: boolean;
+	resize?: boolean;
 	rules?: any;
 	save?: string;
 	scheme?: any;
@@ -2389,9 +2500,10 @@ interface contextmenuConfig{
 	scrollSpeed?: string;
 	select?: boolean|string;
 	subMenuPos?: string;
-	submenu?: any;
+	submenuConfig?: any;
 	template?: string|WebixCallback;
 	templateCopy?: WebixCallback;
+	toFront?: boolean;
 	tooltip?: any;
 	top?: number;
 	type?: any;
@@ -2401,11 +2513,12 @@ interface contextmenuConfig{
 	yCount?: number;
 	zIndex?: number;
 }
+type contextmenuEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeShow'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onHide'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMenuItemClick'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPaste'|'onSelectChange'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface contextmenu extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:contextmenuEventName, functor:WebixCallback, id?:string):string|number;
 	attachTo(view:any):void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
@@ -2414,92 +2527,96 @@ interface contextmenu extends webix.ui.baseview{
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
 	close():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
 	destructor():void;
 	detachEvent(id:string):void;
 	disable():void;
-	disableItem(id:string):void;
+	disableItem(id:string|number):void;
 	enable():void;
-	enableItem(id:string):void;
-	exists(id:string):boolean;
+	enableItem(id:string|number):void;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getBody():any;
 	getChildViews():any[];
 	getContext():any;
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
 	getHead():any;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
 	getMenu(id:string|number):any;
-	getMenuItem(id:string):any;
-	getNextId(id:string, step:number):string;
+	getMenuItem(id:string|number):any;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getSubMenu(id:string|number):any;
 	getTopMenu():any;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	hideItem(id:string):void;
+	hideItem(id:string|number):void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	resizeChildren():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
 	selectAll(from?:string, to?:string):void;
 	serialize():any;
+	setContext(context:any):void;
 	setPage(page:number):void;
 	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	show(node?:HTMLElement, position?:any, point?:string):void;
+	showItem(id:string|number):void;
+	sizeToContent():void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+	show(force:boolean,animation:boolean):void;
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -2518,24 +2635,24 @@ interface contextmenu extends webix.ui.baseview{
 interface counterConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -2547,26 +2664,23 @@ interface counterConfig{
 	minWidth?: number;
 	name?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
+	popup?: string;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	step?: number;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type counterEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface counter extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:counterEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -2592,8 +2706,9 @@ interface counter extends webix.ui.baseview{
 	next(step?:number):void;
 	prev(step?:number):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:number):void;
 	shift(value?:number):void;
 	show(force?:boolean, animation?:boolean):void;
@@ -2601,13 +2716,14 @@ interface counter extends webix.ui.baseview{
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -2617,7 +2733,7 @@ interface counter extends webix.ui.baseview{
 	config: counterConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface datasuggestConfig{
 	animate?: any;
@@ -2625,7 +2741,7 @@ interface datasuggestConfig{
 	autofocus?: boolean;
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	filter?: WebixCallback;
@@ -2635,8 +2751,8 @@ interface datasuggestConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
-	input?: any;
+	id?: string|number;
+	input?: HTMLElement|string;
 	keyPressTimeout?: number;
 	left?: number;
 	master?: webix.ui.baseview;
@@ -2650,16 +2766,19 @@ interface datasuggestConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
 	template?: string|WebixTemplate;
 	textValue?: string;
+	toFront?: boolean;
 	top?: number;
 	type?: string;
 	width?: number;
 	zIndex?: number;
 }
+type datasuggestEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValueSuggest'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface datasuggest extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:datasuggestEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -2673,7 +2792,7 @@ interface datasuggest extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getHead():any;
-	getItemText(id:string):string;
+	getItemText(id:string|number):string;
 	getList():webix.ui.baseview;
 	getMasterValue():any;
 	getNode():any;
@@ -2692,10 +2811,11 @@ interface datasuggest extends webix.ui.baseview{
 	setMasterValue(value:any):void;
 	setPosition(x:number, y:number):void;
 	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
+	show(node:HTMLElement, position?:any, point?:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+	show(force:boolean,animation:boolean):void;
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -2707,19 +2827,19 @@ interface datasuggest extends webix.ui.baseview{
 }
 interface datatableConfig{
 	animate?: any;
+	areaselect?: boolean;
 	autoConfig?: boolean;
 	autoheight?: boolean;
 	autowidth?: boolean;
-	blockselect?: boolean;
+	blockselect?: boolean|string;
 	borderless?: boolean;
 	checkboxRefresh?: boolean;
 	clipboard?: boolean|string;
 	columnWidth?: number;
 	columns?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datafetch?: number;
 	datathrottle?: number;
 	datatype?: string;
@@ -2744,10 +2864,11 @@ interface datatableConfig{
 	height?: number;
 	hidden?: boolean;
 	hover?: string;
-	id?: string;
+	id?: string|number;
 	leftSplit?: number;
 	liveValidation?: boolean;
 	loadahead?: number;
+	map?: any;
 	math?: boolean;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -2775,28 +2896,33 @@ interface datatableConfig{
 	rules?: any;
 	save?: string;
 	scheme?: any;
-	scroll?: boolean;
+	scroll?: boolean|string;
 	scrollAlignY?: boolean;
 	scrollX?: boolean;
 	scrollY?: boolean;
 	select?: boolean|string;
 	spans?: any[];
-	tooltip?: any;
+	subRowHeight?: string;
+	subrow?: string;
+	subview?: webix.ui.baseview;
+	tooltip?: boolean;
 	type?: any;
 	url?: string;
 	width?: number;
 	yCount?: number;
 }
+type datatableEventName ='onAfterAdd'|'onAfterAreaAdd'|'onAfterAreaRemove'|'onAfterBlockSelect'|'onAfterColumnDrop'|'onAfterColumnDropOrder'|'onAfterColumnHide'|'onAfterColumnShow'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterEditStart'|'onAfterEditStop'|'onAfterFilter'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onAfterUnSelect'|'onAreaDrag'|'onBeforeAdd'|'onBeforeAreaAdd'|'onBeforeAreaRemove'|'onBeforeBlockSelect'|'onBeforeColumnDrag'|'onBeforeColumnDrop'|'onBeforeColumnDropOrder'|'onBeforeColumnHide'|'onBeforeColumnShow'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeEditStart'|'onBeforeEditStop'|'onBeforeFilter'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBeforeUnSelect'|'onBindRequest'|'onBlur'|'onCheck'|'onCollectValues'|'onColumnResize'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onHeaderClick'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLiveEdit'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onResize'|'onRowResize'|'onScrollX'|'onScrollY'|'onSelectChange'|'onStructureLoad'|'onStructureUpdate'|'onSubViewClose'|'onSubViewCreate'|'onSubViewOpen'|'onSubViewRender'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface datatable extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCellCss(id:string, name:string, css:string):void;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	addRowCss(id:string, css:string):void;
+	addSelectArea(start:any, end:any, preserve:boolean, area_name?:string, css?:string, handle?:boolean):void;
 	addSpan(id:any, column:string, width:number, height:number, value?:string, css?:string):void;
 	adjust():void;
 	adjustColumn(id:string|number, header?:string):void;
 	adjustRowHeight(columnId:string, silent:boolean):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:datatableEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -2804,9 +2930,10 @@ interface datatable extends webix.ui.baseview{
 	clearCss(css:string, silent?:boolean):void;
 	clearSelection():void;
 	clearValidation():void;
-	collectValues(id:string):any[];
-	columnId(index:number):string;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	closeSub(id:string|number):void;
+	collectValues(id:string|number):any[];
+	columnId(index:number):string|number;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	define(property:string, value:any):void;
 	destructor():void;
@@ -2822,91 +2949,98 @@ interface datatable extends webix.ui.baseview{
 	editRow(id:string):void;
 	editStop():void;
 	enable():void;
-	exists(id:string):boolean;
-	exportToExcel(url?:string):void;
-	exportToPDF(url?:string):void;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
 	filterByAll():void;
 	find(criterion:WebixCallback, first?:boolean):any;
 	focusEditor():void;
+	getAllSelectAreas():any;
 	getChildViews():any[];
 	getColumnConfig(id:string):any;
-	getColumnIndex(id:string):number;
+	getColumnIndex(id:string|number):number;
 	getEditState():any;
 	getEditor(row?:any, column?:string|number):any;
 	getEditorValue():string;
-	getFilter(columnID:string):any;
-	getFirstId():string;
+	getFilter(columnID:string|number):any;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getHeaderContent(id:string):{ [key: string]: any; };
+	getHeaderContent(id:string|number):{ [key: string]: any; };
 	getHeaderNode(columnId:string, rowIndex?:number):HTMLElement;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
-	getSelectedId(asArray?:boolean, asString?:boolean):any;
-	getSelectedItem(mode?:boolean):void;
+	getSelectArea(area_name:string):any;
+	getSelectedId(asArray:boolean, asString:boolean):any;
+	getSelectedItem(as_array?:boolean):any;
+	getSpan():any[];
 	getState():any;
-	getText(rowid:string, colid:string):string;
+	getSubView(id:string|number):any;
+	getText(rowid:string|number, colid:string|number):string;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
 	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	hideColumn(id:string):void;
+	hideColumn(id:string|number):void;
 	hideOverlay():void;
-	isColumnVisible(id:string):boolean;
+	isColumnVisible(id:string|number):boolean;
 	isEnabled():boolean;
+	isSelected(id:string|number):void;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
 	locate(node:HTMLElement|Event):any;
 	mapCells(startrow:number, startcol:string, numrows:number, numcols:number, callback:WebixCallback):void;
 	mapEvent(map:any):void;
 	mapSelection(callback:WebixCallback):void;
-	markSorting(column_id:string, dir:string):void;
+	markSorting(column_id:string, direction:string):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
+	moveBottom(id:string|number):void;
 	moveColumn(id:string, index:number):void;
-	moveDown(id:string, step:number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
+	openSub(id:string|number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	refreshColumns(config?:any[]):void;
-	refreshFilter(id:string):void;
+	refresh(id?:string|number):void;
+	refreshColumns(config?:any[], reset?:boolean):void;
+	refreshFilter(id:string|number):void;
 	refreshHeaderContent():void;
 	registerFilter(node:HTMLElement, config:any, obj:any):void;
-	remove(id:string):void;
+	remove(id:string|number):void;
 	removeCellCss(id:string, name:string, css_name:string):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
 	removeRowCss(id:string, css_name:string):void;
+	removeSelectArea(area_name:string):void;
 	removeSpan(id:string|number, column:string):void;
-	render(id:string, data:any, operation:string):void;
+	render(id:string|number, data:any, operation:string):void;
 	resize():void;
+	resizeSubView(id:string|number):void;
 	scrollTo(x:number, y:number):void;
-	select(row_id:string, preserve:boolean):void;
-	selectRange(row_id:any, end_row_id:any):void;
+	select(row_id:string|number, preserve:boolean):void;
+	selectAll():void;
+	selectRange(row_id:string|number, end_row_id:string|number, preserve?:boolean):void;
 	serialize():any;
-	setColumnWidth(id:string, width:number):void;
+	setColumnWidth(id:string|number, width:number):void;
 	setPage(page:number):void;
-	setRowHeight(id:string, height:number):void;
+	setRowHeight(id:string|number, height:number):void;
 	setState(state:any):void;
 	show(force?:boolean, animation?:boolean):void;
 	showCell(row:string, column:string):void;
-	showColumn(id:string):void;
-	showColumnBatch(batch:string|number):void;
-	showItem(id:string):void;
+	showColumn(id:string|number):void;
+	showColumnBatch(batch:string|number, preserve:boolean):void;
+	showItem(id:string|number):void;
 	showItemByIndex(index:number):void;
 	showOverlay(message:string):void;
 	sort(by:string, dir?:string, as?:string):void;
@@ -2914,18 +3048,20 @@ interface datatable extends webix.ui.baseview{
 	unbind():void;
 	unblockEvent():void;
 	ungroup(mode:boolean):void;
-	unselect(row_id:string):void;
-	updateItem(id:string, data:any):void;
+	unselect(row_id:string|number):void;
+	unselectAll():void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
-	validateEditor(id?:string):boolean;
+	validateEditor(id?:string|number):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -2939,14 +3075,14 @@ interface datatable extends webix.ui.baseview{
 	on_context: { [key: string]: any; };
 	on_dblclick: WebixCallback;
 	on_mouse_move: WebixCallback;
-	waitData: PromisedData;
+	waitData: webix.promise;
 }
 interface dataviewConfig{
 	animate?: any;
 	autoheight?: boolean;
 	borderless?: boolean;
 	click?: string|WebixCallback;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -2960,14 +3096,14 @@ interface dataviewConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	loadahead?: number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
@@ -2991,18 +3127,19 @@ interface dataviewConfig{
 	xCount?: number;
 	yCount?: number;
 }
+type dataviewEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface dataview extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:dataviewEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
@@ -3010,47 +3147,48 @@ interface dataview extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getTopParentView():webix.ui.baseview;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -3058,23 +3196,24 @@ interface dataview extends webix.ui.baseview{
 	serialize():any;
 	setPage(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -3089,18 +3228,18 @@ interface dataview extends webix.ui.baseview{
 	on_mouse_move: WebixCallback;
 	type: { [key: string]: any; };
 	types: { [key: string]: any; };
-	waitData: PromisedData;
+	waitData: webix.promise;
 }
 interface datepickerConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	editable?: boolean;
@@ -3111,11 +3250,11 @@ interface datepickerConfig{
 	hotkey?: string;
 	icon?: string;
 	icons?: boolean;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -3126,28 +3265,28 @@ interface datepickerConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	stringResult?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	text?: string;
 	timeIcon?: string;
 	timepicker?: boolean;
 	tooltip?: string;
 	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: Date|string;
 	width?: number;
 }
+type datepickerEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface datepicker extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:datepickerEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -3173,21 +3312,23 @@ interface datepicker extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -3197,26 +3338,27 @@ interface datepicker extends webix.ui.baseview{
 	config: datepickerConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface fieldsetConfig{
 	animate?: any;
 	body?: webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
-	label?: any;
+	id?: string|number;
+	label?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	width?: number;
 }
+type fieldsetEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface fieldset extends webix.ui.baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -3236,7 +3378,8 @@ interface fieldset extends webix.ui.baseview{
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -3251,7 +3394,8 @@ interface formConfig{
 	autoheight?: boolean;
 	borderless?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	complexData?: boolean;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -3262,7 +3406,7 @@ interface formConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	margin?: number;
 	maxHeight?: number;
@@ -3283,10 +3427,11 @@ interface formConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type formEventName ='onAfterLoad'|'onAfterScroll'|'onAfterValidation'|'onBeforeLoad'|'onBeforeValidate'|'onBindRequest'|'onChange'|'onDestruct'|'onLoadError'|'onSubmit'|'onValidationError'|'onValidationSuccess'|'onValues';
 interface form extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:formEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -3313,13 +3458,14 @@ interface form extends webix.ui.baseview{
 	isDirty():boolean;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	mapEvent(map:any):void;
+	markInvalid(name:string, state?:boolean|string):void;
 	parse(data:any, type:string):void;
 	reconstruct():void;
 	refresh():void;
-	removeView(id:string):void;
-	render(id:string, data:any, type:string):void;
+	removeView(id:string|number):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	resizeChildren():void;
 	scrollTo(x:number, y:number):void;
@@ -3329,8 +3475,9 @@ interface form extends webix.ui.baseview{
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
+	validate(mode?:any):boolean;
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -3345,7 +3492,7 @@ interface gridsuggestConfig{
 	autofocus?: boolean;
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	filter?: WebixCallback;
@@ -3355,8 +3502,8 @@ interface gridsuggestConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
-	input?: any;
+	id?: string|number;
+	input?: HTMLElement|string;
 	keyPressTimeout?: number;
 	left?: number;
 	master?: webix.ui.baseview;
@@ -3370,16 +3517,19 @@ interface gridsuggestConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
 	template?: string|WebixTemplate;
 	textValue?: string;
+	toFront?: boolean;
 	top?: number;
 	type?: string;
 	width?: number;
 	zIndex?: number;
 }
+type gridsuggestEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValueSuggest'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface gridsuggest extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:gridsuggestEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -3393,7 +3543,7 @@ interface gridsuggest extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getHead():any;
-	getItemText(id:string):string;
+	getItemText(id:string|number):string;
 	getList():webix.ui.baseview;
 	getMasterValue():any;
 	getNode():any;
@@ -3412,10 +3562,11 @@ interface gridsuggest extends webix.ui.baseview{
 	setMasterValue(value:any):void;
 	setPosition(x:number, y:number):void;
 	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
+	show(node:HTMLElement, position?:any, point?:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+	show(force:boolean,animation:boolean):void;
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -3432,7 +3583,7 @@ interface grouplistConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -3445,14 +3596,14 @@ interface grouplistConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	layout?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
@@ -3469,10 +3620,10 @@ interface grouplistConfig{
 	scrollSpeed?: string;
 	select?: boolean|string;
 	template?: string|WebixCallback;
-	templateBack?: string|WebixTemplate;
+	templateBack?: string|string|WebixTemplate;
 	templateCopy?: WebixCallback;
-	templateGroup?: string|WebixTemplate;
-	templateItem?: string|WebixTemplate;
+	templateGroup?: string|WebixCallback;
+	templateItem?: string|WebixCallback;
 	tooltip?: any;
 	type?: any;
 	url?: string;
@@ -3480,18 +3631,19 @@ interface grouplistConfig{
 	xCount?: number;
 	yCount?: number;
 }
+type grouplistEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPaste'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface grouplist extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:grouplistEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
@@ -3499,50 +3651,51 @@ interface grouplist extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getOpenState():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
 	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -3550,7 +3703,7 @@ interface grouplist extends webix.ui.baseview{
 	serialize():any;
 	setPage(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
@@ -3558,16 +3711,17 @@ interface grouplist extends webix.ui.baseview{
 	ungroup(mode:boolean):void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -3588,13 +3742,13 @@ interface headerlayoutConfig{
 	borderless?: boolean;
 	collapsed?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	margin?: number;
 	maxHeight?: number;
@@ -3613,10 +3767,11 @@ interface headerlayoutConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type headerlayoutEventName ='onAfterCollapse'|'onAfterExpand'|'onBindRequest'|'onDestruct';
 interface headerlayout extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:headerlayoutEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -3637,14 +3792,15 @@ interface headerlayout extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
 	show(force?:boolean, animation?:boolean):void;
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -3655,19 +3811,19 @@ interface headerlayout extends webix.ui.baseview{
 }
 interface htmlformConfig{
 	animate?: any;
-	autoheight?: any;
+	autoheight?: boolean;
 	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	complexData?: boolean;
+	container?: string|HTMLElement;
+	content?: string|number|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datatype?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -3678,15 +3834,16 @@ interface htmlformConfig{
 	scrollSpeed?: string;
 	src?: string;
 	template?: string|WebixCallback;
-	type?: string;
 	url?: string;
 	width?: number;
 }
+type htmlformEventName ='onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onBeforeLoad'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValues'|'onViewResize';
 interface htmlform extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:htmlformEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
+	blur():void;
 	callEvent(name:string, params:any[]):boolean;
 	clear(all?:boolean):void;
 	define(property:string, value:any):void;
@@ -3709,11 +3866,12 @@ interface htmlform extends webix.ui.baseview{
 	isDirty():boolean;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	mapEvent(map:any):void;
+	markInvalid(name:string, state?:boolean|string):void;
 	parse(data:any, type:string):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	setContent(node:any):void;
@@ -3724,7 +3882,8 @@ interface htmlform extends webix.ui.baseview{
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -3737,39 +3896,36 @@ interface htmlform extends webix.ui.baseview{
 interface iconConfig{
 	align?: string;
 	animate?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	icon?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	name?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type iconEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface icon extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:iconEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -3793,16 +3949,18 @@ interface icon extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
+	$renderInput(config:any):HTMLElement;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -3812,18 +3970,18 @@ interface icon extends webix.ui.baseview{
 	config: iconConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface iframeConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -3832,9 +3990,10 @@ interface iframeConfig{
 	src?: string;
 	width?: number;
 }
+type iframeEventName ='onAfterLoad'|'onAfterScroll'|'onBeforeLoad'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface iframe extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:iframeEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -3860,7 +4019,8 @@ interface iframe extends webix.ui.baseview{
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -3873,17 +4033,17 @@ interface iframe extends webix.ui.baseview{
 interface labelConfig{
 	align?: string;
 	animate?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputWidth?: number;
 	label?: string;
@@ -3894,18 +4054,16 @@ interface labelConfig{
 	minWidth?: number;
 	name?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type labelEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface label extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:labelEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -3929,7 +4087,7 @@ interface label extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	setHTML(html:string):void;
 	setValue(value:string):void;
@@ -3937,9 +4095,11 @@ interface label extends webix.ui.baseview{
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
+	$renderInput(config:any):HTMLElement;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -3949,19 +4109,19 @@ interface label extends webix.ui.baseview{
 	config: labelConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface layoutConfig{
 	animate?: any;
 	borderless?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	margin?: number;
 	maxHeight?: number;
@@ -3978,10 +4138,11 @@ interface layoutConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type layoutEventName ='onBindRequest'|'onDestruct';
 interface layout extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:layoutEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -4002,14 +4163,15 @@ interface layout extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
 	show(force?:boolean, animation?:boolean):void;
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -4025,7 +4187,7 @@ interface listConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -4038,14 +4200,14 @@ interface listConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	layout?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
@@ -4070,18 +4232,19 @@ interface listConfig{
 	xCount?: number;
 	yCount?: number;
 }
+type listEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPaste'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface list extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:listEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
@@ -4089,48 +4252,49 @@ interface list extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -4138,23 +4302,24 @@ interface list extends webix.ui.baseview{
 	serialize():any;
 	setPage(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -4177,7 +4342,7 @@ interface menuConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -4190,20 +4355,21 @@ interface menuConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	layout?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
 	onContext?: { [key: string]: any; };
 	onDblClick?: WebixCallback;
 	onMouseMove?: WebixCallback;
+	openAction?: string;
 	pager?: any;
 	ready?: WebixCallback;
 	removeMissed?: boolean;
@@ -4214,7 +4380,7 @@ interface menuConfig{
 	scrollSpeed?: string;
 	select?: boolean|string;
 	subMenuPos?: string;
-	submenu?: any;
+	submenuConfig?: any;
 	template?: string|WebixCallback;
 	templateCopy?: WebixCallback;
 	tooltip?: any;
@@ -4224,74 +4390,76 @@ interface menuConfig{
 	xCount?: number;
 	yCount?: number;
 }
+type menuEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMenuItemClick'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPaste'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface menu extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:menuEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
 	destructor():void;
 	detachEvent(id:string):void;
 	disable():void;
-	disableItem(id:string):void;
+	disableItem(id:string|number):void;
 	enable():void;
-	enableItem(id:string):void;
-	exists(id:string):boolean;
+	enableItem(id:string|number):void;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
 	getMenu(id:string|number):any;
-	getMenuItem(id:string):any;
-	getNextId(id:string, step:number):string;
+	getMenuItem(id:string|number):any;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getSubMenu(id:string|number):any;
 	getTopMenu():any;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	hideItem(id:string):void;
+	hideItem(id:string|number):void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -4299,23 +4467,25 @@ interface menu extends webix.ui.baseview{
 	serialize():any;
 	setPage(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
+	sizeToContent():void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -4334,60 +4504,61 @@ interface menu extends webix.ui.baseview{
 interface multicomboConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
+	button?: boolean;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	icon?: string;
-	iconWidth?: any;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
+	keepText?: boolean;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
-	master?: any;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	name?: string;
+	newValues?: boolean;
 	on?: any;
 	optionWidth?: number;
 	options?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	popupWidth?: number;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	separator?: string;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
+	tagMode?: boolean;
+	tagTemplate?: WebixCallback;
 	text?: string;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type multicomboEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface multicombo extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:multicomboEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -4401,6 +4572,7 @@ interface multicombo extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getInputNode():HTMLElement;
+	getList():webix.ui.baseview;
 	getNode():any;
 	getParentView():any;
 	getPopup():webix.ui.baseview;
@@ -4413,22 +4585,23 @@ interface multicombo extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
+
 	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
-	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -4438,18 +4611,18 @@ interface multicombo extends webix.ui.baseview{
 	config: multicomboConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface multiselectConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -4457,15 +4630,14 @@ interface multiselectConfig{
 	hidden?: boolean;
 	hotkey?: string;
 	icon?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
-	master?: any;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -4475,27 +4647,26 @@ interface multiselectConfig{
 	optionWidth?: number;
 	options?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	popupWidth?: number;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	separator?: string;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	text?: string;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type multiselectEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface multiselect extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:multiselectEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -4509,6 +4680,7 @@ interface multiselect extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getInputNode():HTMLElement;
+	getList():webix.ui.baseview;
 	getNode():any;
 	getParentView():any;
 	getPopup():webix.ui.baseview;
@@ -4521,22 +4693,24 @@ interface multiselect extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
+
 	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -4546,7 +4720,7 @@ interface multiselect extends webix.ui.baseview{
 	config: multiselectConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface multisuggestConfig{
 	animate?: any;
@@ -4556,7 +4730,7 @@ interface multisuggestConfig{
 	borderless?: boolean;
 	button?: boolean;
 	buttonText?: string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	filter?: WebixCallback;
@@ -4566,8 +4740,8 @@ interface multisuggestConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
-	input?: any;
+	id?: string|number;
+	input?: HTMLElement|string;
 	keyPressTimeout?: number;
 	left?: number;
 	master?: webix.ui.baseview;
@@ -4581,17 +4755,21 @@ interface multisuggestConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
 	separator?: string;
 	template?: string|WebixTemplate;
 	textValue?: string;
+	toFront?: boolean;
 	top?: number;
 	type?: string;
+	value?: string|number;
 	width?: number;
 	zIndex?: number;
 }
+type multisuggestEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValueSuggest'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface multisuggest extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:multisuggestEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -4606,7 +4784,7 @@ interface multisuggest extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getHead():any;
-	getItemText(id:string):string;
+	getItemText(id:string|number):string;
 	getList():webix.ui.baseview;
 	getMasterValue():any;
 	getNode():any;
@@ -4628,7 +4806,8 @@ interface multisuggest extends webix.ui.baseview{
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -4641,13 +4820,13 @@ interface multisuggest extends webix.ui.baseview{
 interface multitextConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -4656,11 +4835,11 @@ interface multitextConfig{
 	hotkey?: string;
 	icon?: string;
 	iconWidth?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -4671,26 +4850,25 @@ interface multitextConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	separator?: string;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type multitextEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface multitext extends webix.ui.baseview{
 	addSection():string|number;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:multitextEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -4716,8 +4894,9 @@ interface multitext extends webix.ui.baseview{
 	mapEvent(map:any):void;
 	refresh():void;
 	removeSection(id?:string|number):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	setValueHere(value:string|number):void;
 	show(force?:boolean, animation?:boolean):void;
@@ -4725,14 +4904,15 @@ interface multitext extends webix.ui.baseview{
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
+
 	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -4742,22 +4922,22 @@ interface multitext extends webix.ui.baseview{
 	config: multitextConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface multiviewConfig{
 	animate?: any;
 	borderless?: boolean;
 	cells?: any;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	fitBiggest?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
-	keepViews?: any;
+	id?: string|number;
+	keepViews?: boolean;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -4768,10 +4948,11 @@ interface multiviewConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type multiviewEventName ='onBeforeBack'|'onBindRequest'|'onDestruct'|'onViewChange';
 interface multiview extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:multiviewEventName, functor:WebixCallback, id?:string):string|number;
 	back(step:number):void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
@@ -4787,7 +4968,7 @@ interface multiview extends webix.ui.baseview{
 	getNode():any;
 	getParentView():any;
 	getTopParentView():webix.ui.baseview;
-	getValue():string;
+	getValue():string|number;
 	hasEvent(name:string):boolean;
 	hide():void;
 	index(obj:any):number;
@@ -4795,15 +4976,16 @@ interface multiview extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
-	setValue(toshow:string):void;
+	setValue(toshow:string|number):void;
 	show(force?:boolean, animation?:boolean):void;
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -4818,7 +5000,7 @@ interface organogramConfig{
 	autowidth?: boolean;
 	borderless?: boolean;
 	click?: string|WebixCallback;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -4829,13 +5011,13 @@ interface organogramConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
 	onContext?: { [key: string]: any; };
@@ -4855,17 +5037,18 @@ interface organogramConfig{
 	url?: string;
 	width?: number;
 }
+type organogramEventName ='onAfterAdd'|'onAfterClose'|'onAfterContextMenu'|'onAfterDelete'|'onAfterLoad'|'onAfterOpen'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeClose'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeLoad'|'onBeforeOpen'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onFocus'|'onItemCheck'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface organogram extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:organogramEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
-	close(id:string):void;
+	close(id:string|number):void;
 	closeAll():void;
 	count():number;
 	customize(obj:any):void;
@@ -4874,52 +5057,53 @@ interface organogram extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBranchIndex(id:string, parent?:string):number;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getBranchIndex(id:string|number, parent?:string|number):number;
 	getChildViews():any[];
-	getFirstChildId(id:string):string;
-	getFirstId():string;
+	getFirstChildId(id:string|number):string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getNextSiblingId(id:string|number):string|number;
 	getNode():any;
 	getOpenItems():any[];
-	getParentId(id:string):string;
+	getParentId(id:string|number):string|number;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
+	getPrevId(id:string|number, step:number):string|number;
+	getPrevSiblingId(id:string|number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getState():any;
 	getTopParentView():webix.ui.baseview;
 	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	isBranch(id:string):boolean;
-	isBranchOpen(id:string):boolean;
+	isBranch(id:string|number):boolean;
+	isBranchOpen(id:string|number):boolean;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	loadBranch(id:string|number, callback:WebixCallback, url:string):void;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
-	open(id:string):void;
+	open(id:string|number, show?:boolean):void;
 	openAll():void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -4927,7 +5111,7 @@ interface organogram extends webix.ui.baseview{
 	serialize():any;
 	setState(state:any):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
@@ -4935,8 +5119,9 @@ interface organogram extends webix.ui.baseview{
 	ungroup(mode:boolean):void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
-	$getSize():any[];
+	updateItem(id:string|number, data:any):void;
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -4954,10 +5139,9 @@ interface organogram extends webix.ui.baseview{
 }
 interface pagerConfig{
 	animate?: any;
-	apiOnly?: any;
+	apiOnly?: boolean;
 	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	count?: number;
 	css?: string;
 	disabled?: boolean;
@@ -4965,7 +5149,7 @@ interface pagerConfig{
 	group?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	limit?: number;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -4982,9 +5166,10 @@ interface pagerConfig{
 	template?: string|WebixCallback;
 	width?: number;
 }
+type pagerEventName ='onAfterContextMenu'|'onAfterRender'|'onAfterScroll'|'onBeforeContextMenu'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface pager extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:pagerEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -5005,15 +5190,16 @@ interface pager extends webix.ui.baseview{
 	isEnabled():boolean;
 	isVisible():boolean;
 	mapEvent(map:any):void;
-	refresh(id?:string):void;
-	render(id:string, data:any, type:string):void;
+	refresh(id?:string|number):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	select(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -5034,7 +5220,7 @@ interface popupConfig{
 	autofocus?: boolean;
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -5042,7 +5228,7 @@ interface popupConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	left?: number;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -5054,13 +5240,16 @@ interface popupConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
+	toFront?: boolean;
 	top?: number;
 	width?: number;
 	zIndex?: number;
 }
+type popupEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface popup extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:popupEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -5085,10 +5274,11 @@ interface popup extends webix.ui.baseview{
 	resize():void;
 	resizeChildren():void;
 	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
+	show(node?:HTMLElement, position?:any, point?:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+	show(force:boolean,animation:boolean):void;
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -5103,13 +5293,13 @@ interface portletConfig{
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	layoutType?: string;
 	margin?: number;
@@ -5127,10 +5317,11 @@ interface portletConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type portletEventName ='onBindRequest'|'onDestruct';
 interface portlet extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:portletEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -5153,15 +5344,16 @@ interface portlet extends webix.ui.baseview{
 	markDropArea(target:string, mode:string):void;
 	movePortlet(target:string, mode:string):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
 	show(force?:boolean, animation?:boolean):void;
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
+
 	$drag(source:HTMLElement, ev:Event):string;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -5174,11 +5366,10 @@ interface propertyConfig{
 	animate?: any;
 	autoheight?: boolean;
 	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	complexData?: boolean;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datatype?: string;
 	disabled?: boolean;
 	editValue?: string;
@@ -5189,7 +5380,8 @@ interface propertyConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
+	map?: any;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -5204,12 +5396,14 @@ interface propertyConfig{
 	scroll?: boolean|string;
 	scrollSpeed?: string;
 	template?: string|WebixCallback;
+	tooltip?: any;
 	url?: string;
 	width?: number;
 }
+type propertyEventName ='onAfterContextMenu'|'onAfterEditStart'|'onAfterEditStop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onBeforeContextMenu'|'onBeforeEditStart'|'onBeforeEditStop'|'onBeforeLoad'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLiveEdit'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface property extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:propertyEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -5230,7 +5424,7 @@ interface property extends webix.ui.baseview{
 	getEditorValue():string;
 	getFormView():webix.ui.baseview;
 	getItem(id:string):any;
-	getItemNode(id:string):void;
+	getItemNode(id:string|number):void;
 	getNode():any;
 	getParentView():any;
 	getScrollState():any;
@@ -5240,24 +5434,25 @@ interface property extends webix.ui.baseview{
 	hide():void;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	locate(e:Event):string;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
+	refresh(id?:string|number):void;
 	registerType(name:string, data:any):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	setValues(values:any, update?:boolean):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	updateItem():void;
-	validateEditor(id?:string):boolean;
-	$getSize():any[];
+	validateEditor(id?:string|number):boolean;
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -5277,13 +5472,13 @@ interface property extends webix.ui.baseview{
 interface radioConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	customRadio?: boolean;
 	disabled?: boolean;
@@ -5291,11 +5486,11 @@ interface radioConfig{
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -5307,26 +5502,23 @@ interface radioConfig{
 	on?: any;
 	optionHeight?: number;
 	options?: any[];
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
+	popup?: string;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	vertical?: boolean;
 	width?: number;
 }
+type radioEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface radio extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:radioEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -5350,21 +5542,23 @@ interface radio extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -5374,33 +5568,178 @@ interface radio extends webix.ui.baseview{
 	config: radioConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
+}
+interface rangechartConfig{
+	alpha?: number;
+	animate?: any;
+	barWidth?: number;
+	border?: boolean;
+	borderColor?: string;
+	borderless?: boolean;
+	cant?: number;
+	color?: string|WebixCallback;
+	container?: string|HTMLElement;
+	css?: string;
+	data?: string|any[];
+	datathrottle?: number;
+	datatype?: string;
+	disableLines?: boolean;
+	disabled?: boolean;
+	eventRadius?: number;
+	fill?: string;
+	fixOverflow?: boolean;
+	frameId?: string;
+	gradient?: boolean|string|WebixCallback;
+	gravity?: number;
+	height?: number;
+	hidden?: boolean;
+	id?: string|number;
+	item?: any;
+	label?: string|WebixCallback;
+	labelOffset?: number;
+	legend?: any;
+	line?: any;
+	lineColor?: string;
+	maxHeight?: number;
+	maxWidth?: number;
+	minHeight?: number;
+	minWidth?: number;
+	mouseEventDelay?: number;
+	offset?: boolean;
+	on?: any;
+	onClick?: { [key: string]: any; };
+	onContext?: { [key: string]: any; };
+	onDblClick?: WebixCallback;
+	onMouseMove?: WebixCallback;
+	origin?: number;
+	padding?: any;
+	pieHeight?: number;
+	pieInnerText?: string|WebixCallback;
+	preset?: string;
+	radius?: number;
+	range?: any;
+	ready?: WebixCallback;
+	removeMissed?: boolean;
+	save?: string;
+	scale?: string;
+	scheme?: any;
+	series?: any;
+	shadow?: boolean;
+	tooltip?: any;
+	type?: string;
+	url?: string;
+	value?: string|WebixTemplate;
+	width?: number;
+	x?: number;
+	xAxis?: any;
+	xValue?: string;
+	y?: number;
+	yAxis?: any;
+	yValue?: string;
+}
+type rangechartEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterLoad'|'onAfterRangeChange'|'onAfterRender'|'onAfterScroll'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
+interface rangechart extends webix.ui.baseview{
+	add(obj:any, index?:number):string|number;
+	addSeries(obj:any):void;
+	adjust():void;
+	attachEvent(type:rangechartEventName, functor:WebixCallback, id?:string):string|number;
+	bind(target:any, rule?:WebixCallback, format?:string):void;
+	blockEvent():void;
+	callEvent(name:string, params:any[]):boolean;
+	clearAll():void;
+	clearCanvas():void;
+	count():number;
+	define(property:string, value:any):void;
+	destructor():void;
+	detachEvent(id:string):void;
+	disable():void;
+	enable():void;
+	exists(id:string|number):boolean;
+	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getChildViews():any[];
+	getFirstId():string|number;
+	getFormView():webix.ui.baseview;
+	getFrameData():any[];
+	getFrameRange():any;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getNode():any;
+	getParentView():any;
+	getPrevId(id:string|number, step:number):string|number;
+	getTopParentView():webix.ui.baseview;
+	group(config:any, mode:boolean):void;
+	hasEvent(name:string):boolean;
+	hide():void;
+	hideSeries(series:string):void;
+	isEnabled():boolean;
+	isVisible():boolean;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
+	locate(e:Event):string|number;
+	mapEvent(map:any):void;
+	parse(data:any, type:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
+	removeAllSeries():void;
+	render(id:string|number, data:any, type:string):void;
+	resize():void;
+	serialize():any;
+	setFrameRange(range:any):void;
+	show(force?:boolean, animation?:boolean):void;
+	showSeries(series:string):void;
+	sort(by:string, dir?:string, as?:string):void;
+	sync(source:any, filter:WebixCallback, silent:boolean):void;
+	unbind():void;
+	unblockEvent():void;
+	ungroup(mode:boolean):void;
+	updateItem(id:string|number, data:any):void;
+
+	$getSize: any[];
+	$height: number;
+	$scope: any;
+	$setSize(x:number, y:number):boolean;
+	$skin: any;
+	$view: HTMLElement;
+	$width: number;
+	colormap: { [key: string]: any; };
+	config: rangechartConfig;
+	name: string;
+	on_click: WebixCallback;
+	on_context: { [key: string]: any; };
+	on_dblclick: WebixCallback;
+	on_mouse_move: WebixCallback;
+	presets: { [key: string]: any; };
 }
 interface rangesliderConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
-	max?: any;
+	max?: number;
 	maxHeight?: number;
 	maxWidth?: number;
 	min?: number;
@@ -5408,29 +5747,26 @@ interface rangesliderConfig{
 	minWidth?: number;
 	name?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
+	popup?: string;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	separator?: string;
 	step?: number;
 	stringResult?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	title?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type rangesliderEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSliderDrag'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface rangeslider extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:rangesliderEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -5454,22 +5790,24 @@ interface rangeslider extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
+
 	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -5480,18 +5818,18 @@ interface rangeslider extends webix.ui.baseview{
 	config: rangesliderConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface resizerConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -5503,6 +5841,7 @@ interface resizerConfig{
 	onMouseMove?: WebixCallback;
 	width?: number;
 }
+type resizerEventName ='onAfterContextMenu'|'onAfterScroll'|'onBeforeContextMenu'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface resizer extends webix.ui.baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -5521,7 +5860,8 @@ interface resizer extends webix.ui.baseview{
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -5538,13 +5878,13 @@ interface resizer extends webix.ui.baseview{
 interface richselectConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -5552,11 +5892,11 @@ interface richselectConfig{
 	hidden?: boolean;
 	hotkey?: string;
 	icon?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -5568,26 +5908,25 @@ interface richselectConfig{
 	on?: any;
 	options?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	popupWidth?: number;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	text?: string;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type richselectEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface richselect extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:richselectEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -5601,6 +5940,7 @@ interface richselect extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getInputNode():HTMLElement;
+	getList():webix.ui.baseview;
 	getNode():any;
 	getParentView():any;
 	getPopup():webix.ui.baseview;
@@ -5613,21 +5953,23 @@ interface richselect extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -5637,32 +5979,38 @@ interface richselect extends webix.ui.baseview{
 	config: richselectConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface scrollviewConfig{
 	animate?: any;
 	body?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
+	on?: any;
 	scroll?: boolean|string;
 	scrollSpeed?: string;
 	width?: number;
 }
+type scrollviewEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface scrollview extends webix.ui.baseview{
 	adjust():void;
+	attachEvent(type:scrollviewEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
+	blockEvent():void;
+	callEvent(name:string, params:any[]):boolean;
 	define(property:string, value:any):void;
 	destructor():void;
+	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
 	getBody():any;
@@ -5672,16 +6020,20 @@ interface scrollview extends webix.ui.baseview{
 	getParentView():any;
 	getScrollState():any;
 	getTopParentView():webix.ui.baseview;
+	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
 	isVisible():boolean;
+	mapEvent(map:any):void;
 	resize():void;
 	resizeChildren():void;
 	scrollTo(x:number, y:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showView(id:string):void;
+	showView(id:string|number):void;
 	unbind():void;
-	$getSize():any[];
+	unblockEvent():void;
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -5694,13 +6046,13 @@ interface scrollview extends webix.ui.baseview{
 interface searchConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
@@ -5708,11 +6060,11 @@ interface searchConfig{
 	hidden?: boolean;
 	hotkey?: string;
 	icon?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -5723,24 +6075,24 @@ interface searchConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
 	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type searchEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSearchIconClick'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface search extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:searchEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -5764,21 +6116,23 @@ interface search extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -5788,29 +6142,29 @@ interface search extends webix.ui.baseview{
 	config: searchConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface segmentedConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -5821,27 +6175,25 @@ interface segmentedConfig{
 	multiview?: boolean;
 	name?: string;
 	on?: any;
+	optionWidth?: number;
 	options?: any;
-	placeholder?: string;
-	popup?: any;
-	readonly?: boolean;
+	popup?: string;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type segmentedEventName ='onAfterRender'|'onAfterScroll'|'onAfterTabClick'|'onBeforeRender'|'onBeforeTabClick'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onOptionRemove'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface segmented extends webix.ui.baseview{
-	addOption(id:string, value:any, show?:boolean, index?:number):void;
+	addOption(id:string|number, value:any, show?:boolean, index?:number):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:segmentedEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -5864,24 +6216,26 @@ interface segmented extends webix.ui.baseview{
 	isEnabled():boolean;
 	isVisible():boolean;
 	mapEvent(map:any):void;
-	optionIndex(ID:string):number;
+	optionIndex(ID:string|number):number;
 	refresh():void;
-	removeOption(id:string):void;
-	render(id:string, data:any, type:string):void;
+	removeOption(id:string|number):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -5891,29 +6245,29 @@ interface segmented extends webix.ui.baseview{
 	config: segmentedConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface selectConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -5925,24 +6279,23 @@ interface selectConfig{
 	on?: any;
 	options?: any[]|string;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type selectEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface select extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:selectEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -5966,21 +6319,23 @@ interface select extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -5990,33 +6345,108 @@ interface select extends webix.ui.baseview{
 	config: selectConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
+}
+interface sidemenuConfig{
+	animate?: any;
+	autofit?: boolean;
+	autofocus?: boolean;
+	body?: string|webix.ui.baseview;
+	borderless?: boolean;
+	container?: string|HTMLElement;
+	css?: string;
+	disabled?: boolean;
+	gravity?: number;
+	head?: any;
+	headHeight?: number;
+	height?: number;
+	hidden?: boolean;
+	id?: string|number;
+	left?: number;
+	maxHeight?: number;
+	maxWidth?: number;
+	minHeight?: number;
+	minWidth?: number;
+	modal?: boolean;
+	move?: boolean;
+	on?: any;
+	padding?: any;
+	position?: string|WebixCallback;
+	relative?: string;
+	resize?: boolean;
+	state?: WebixCallback;
+	toFront?: boolean;
+	top?: number;
+	width?: number;
+	zIndex?: number;
+}
+type sidemenuEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
+interface sidemenu extends webix.ui.baseview{
+	adjust():void;
+	attachEvent(type:sidemenuEventName, functor:WebixCallback, id?:string):string|number;
+	bind(target:any, rule?:WebixCallback, format?:string):void;
+	blockEvent():void;
+	callEvent(name:string, params:any[]):boolean;
+	close():void;
+	define(property:string, value:any):void;
+	destructor():void;
+	detachEvent(id:string):void;
+	disable():void;
+	enable():void;
+	getBody():any;
+	getChildViews():any[];
+	getFormView():webix.ui.baseview;
+	getHead():any;
+	getNode():any;
+	getParentView():any;
+	getTopParentView():webix.ui.baseview;
+	hasEvent(name:string):boolean;
+	hide():void;
+	isEnabled():boolean;
+	isVisible():boolean;
+	mapEvent(map:any):void;
+	resize():void;
+	resizeChildren():void;
+	setPosition(x:number, y:number):void;
+	show(force?:boolean, animation?:boolean):void;
+	unbind():void;
+	unblockEvent():void;
+
+	$getSize: any[];
+	$height: number;
+	$scope: any;
+	$setSize(x:number, y:number):boolean;
+	$skin: any;
+	$view: HTMLElement;
+	$width: number;
+	config: sidemenuConfig;
+	name: string;
 }
 interface sliderConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
-	max?: any;
+	max?: number;
 	maxHeight?: number;
 	maxWidth?: number;
 	min?: number;
@@ -6025,26 +6455,25 @@ interface sliderConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
 	step?: number;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	title?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type sliderEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSliderDrag'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface slider extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:sliderEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -6068,21 +6497,23 @@ interface slider extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -6093,24 +6524,25 @@ interface slider extends webix.ui.baseview{
 	config: sliderConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface spacerConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	width?: number;
 }
+type spacerEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface spacer extends webix.ui.baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -6129,7 +6561,8 @@ interface spacer extends webix.ui.baseview{
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -6139,6 +6572,107 @@ interface spacer extends webix.ui.baseview{
 	config: spacerConfig;
 	name: string;
 }
+interface spreadsheetConfig{
+	animate?: any;
+	borderless?: boolean;
+	buttons?: any;
+	cols?: any[];
+	columnCount?: number;
+	container?: string|HTMLElement;
+	css?: string;
+	data?: string|any[];
+	datatype?: string;
+	disabled?: boolean;
+	gravity?: number;
+	height?: number;
+	hidden?: boolean;
+	id?: string|number;
+	isolate?: boolean;
+	liveEditor?: boolean;
+	margin?: number;
+	math?: boolean;
+	maxHeight?: number;
+	maxWidth?: number;
+	minHeight?: number;
+	minWidth?: number;
+	on?: any;
+	padding?: number;
+	paddingX?: number;
+	paddingY?: number;
+	readonly?: boolean;
+	resizeCell?: boolean;
+	responsive?: string;
+	rowCount?: number;
+	rows?: any[];
+	subbar?: any;
+	type?: string;
+	url?: string;
+	visibleBatch?: string;
+	width?: number;
+}
+type spreadsheetEventName ='onAfterLoad'|'onAfterSelect'|'onBeforeLoad'|'onBeforeSpan'|'onBeforeSplit'|'onBindRequest'|'onCellChange'|'onComponentInit'|'onDataParse'|'onDataSerialize'|'onDestruct'|'onLoadError'|'onReset';
+interface spreadsheet extends webix.ui.baseview{
+	addView(view:any, index?:number):webix.ui.baseview;
+	adjust():void;
+	attachEvent(type:spreadsheetEventName, functor:WebixCallback, id?:string):string|number;
+	bind(target:any, rule?:WebixCallback, format?:string):void;
+	blockEvent():void;
+	callEvent(name:string, params:any[]):boolean;
+	combineCells(range:any):void;
+	define(property:string, value:any):void;
+	destructor():void;
+	detachEvent(id:string):void;
+	disable():void;
+	eachSelectedCell(handler:WebixCallback):void;
+	enable():void;
+	getCellValue(row:number, column:number):string;
+	getChildViews():any[];
+	getColumn(id:string):any;
+	getFormView():webix.ui.baseview;
+	getNode():any;
+	getParentView():any;
+	getRow(id:string):any;
+	getSelectedId():any[];
+	getStyle(row:number, column:number):string;
+	getTopParentView():webix.ui.baseview;
+	hasEvent(name:string):boolean;
+	hide():void;
+	index(obj:any):number;
+	innerId(id:string|number):string|number;
+	isEnabled():boolean;
+	isVisible():boolean;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	mapEvent(map:any):void;
+	parse(data:any, type:string):void;
+	reconstruct():void;
+	redo():void;
+	refresh():void;
+	removeView(id:string|number):void;
+	reset():void;
+	resize():void;
+	resizeChildren():void;
+	saveCell(row:number, column:number):void;
+	serialize():any;
+	setCellValue(row:number, column:any, value:string):void;
+	setStyle(row:number, column:number, style:string):void;
+	show(force?:boolean, animation?:boolean):void;
+	showBatch(name:string):void;
+	splitCell(row:number, column:number):void;
+	ui(view:any):webix.ui.baseview;
+	unbind():void;
+	unblockEvent():void;
+	undo(id:string):void;
+
+	$$: any;
+	$getSize: any[];
+	$height: number;
+	$setSize(x:number, y:number):boolean;
+	$skin: any;
+	$view: HTMLElement;
+	$width: number;
+	config: spreadsheetConfig;
+	name: string;
+}
 interface submenuConfig{
 	animate?: any;
 	autofit?: boolean;
@@ -6149,7 +6683,7 @@ interface submenuConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -6164,7 +6698,7 @@ interface submenuConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	layout?: string;
 	left?: number;
 	maxHeight?: number;
@@ -6174,19 +6708,21 @@ interface submenuConfig{
 	modal?: boolean;
 	mouseEventDelay?: number;
 	move?: boolean;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
 	onContext?: { [key: string]: any; };
 	onDblClick?: WebixCallback;
 	onMouseMove?: WebixCallback;
+	openAction?: string;
 	padding?: any;
 	pager?: any;
 	position?: string|WebixCallback;
 	ready?: WebixCallback;
 	relative?: string;
 	removeMissed?: boolean;
+	resize?: boolean;
 	rules?: any;
 	save?: string;
 	scheme?: any;
@@ -6194,9 +6730,10 @@ interface submenuConfig{
 	scrollSpeed?: string;
 	select?: boolean|string;
 	subMenuPos?: string;
-	submenu?: any;
+	submenuConfig?: any;
 	template?: string|WebixCallback;
 	templateCopy?: WebixCallback;
+	toFront?: boolean;
 	tooltip?: any;
 	top?: number;
 	type?: any;
@@ -6206,11 +6743,12 @@ interface submenuConfig{
 	yCount?: number;
 	zIndex?: number;
 }
+type submenuEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeShow'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onHide'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMenuItemClick'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPaste'|'onSelectChange'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface submenu extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:submenuEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -6218,65 +6756,66 @@ interface submenu extends webix.ui.baseview{
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
 	close():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
 	destructor():void;
 	detachEvent(id:string):void;
 	disable():void;
-	disableItem(id:string):void;
+	disableItem(id:string|number):void;
 	enable():void;
-	enableItem(id:string):void;
-	exists(id:string):boolean;
+	enableItem(id:string|number):void;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getBody():any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
 	getHead():any;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
 	getMenu(id:string|number):any;
-	getMenuItem(id:string):any;
-	getNextId(id:string, step:number):string;
+	getMenuItem(id:string|number):any;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getSubMenu(id:string|number):any;
 	getTopMenu():any;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	hideItem(id:string):void;
+	hideItem(id:string|number):void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	resizeChildren():void;
 	scrollTo(x:number, y:number):void;
@@ -6285,24 +6824,26 @@ interface submenu extends webix.ui.baseview{
 	serialize():any;
 	setPage(page:number):void;
 	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	show(node?:HTMLElement, position?:any, point?:string):void;
+	showItem(id:string|number):void;
+	sizeToContent():void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+	show(force:boolean,animation:boolean):void;
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -6324,7 +6865,7 @@ interface suggestConfig{
 	autofocus?: boolean;
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	filter?: WebixCallback;
@@ -6334,8 +6875,8 @@ interface suggestConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
-	input?: any;
+	id?: string|number;
+	input?: HTMLElement|string;
 	keyPressTimeout?: number;
 	left?: number;
 	master?: webix.ui.baseview;
@@ -6349,16 +6890,19 @@ interface suggestConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
 	template?: string|WebixTemplate;
 	textValue?: string;
+	toFront?: boolean;
 	top?: number;
 	type?: string;
 	width?: number;
 	zIndex?: number;
 }
+type suggestEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValueSuggest'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface suggest extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:suggestEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -6372,7 +6916,7 @@ interface suggest extends webix.ui.baseview{
 	getChildViews():any[];
 	getFormView():webix.ui.baseview;
 	getHead():any;
-	getItemText(id:string):string;
+	getItemText(id:string|number):string;
 	getList():webix.ui.baseview;
 	getMasterValue():any;
 	getNode():any;
@@ -6391,10 +6935,11 @@ interface suggest extends webix.ui.baseview{
 	setMasterValue(value:any):void;
 	setPosition(x:number, y:number):void;
 	setValue(value:string|number):void;
-	show(force?:boolean, animation?:boolean):void;
+	show(node:HTMLElement, position?:any, point?:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+	show(force:boolean,animation:boolean):void;
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -6407,25 +6952,25 @@ interface suggest extends webix.ui.baseview{
 interface tabbarConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
+	bottomLabel?: string;
 	bottomOffset?: number;
-	bottomPadding?: any;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -6437,36 +6982,37 @@ interface tabbarConfig{
 	multiview?: boolean;
 	name?: string;
 	on?: any;
+	optionWidth?: number;
 	options?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	popupTemplate?: WebixCallback;
 	popupWidth?: number;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
 	tabMargin?: number;
 	tabMinWidth?: number;
 	tabMoreWidth?: number;
 	tabOffset?: number;
 	tabbarPopup?: webix.ui.baseview;
-	template?: string|WebixCallback;
 	tooltip?: string;
 	topOffset?: number;
 	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 	yCount?: number;
 }
+type tabbarEventName ='onAfterRender'|'onAfterScroll'|'onAfterTabClick'|'onBeforeRender'|'onBeforeTabClick'|'onBeforeTabClose'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onOptionRemove'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface tabbar extends webix.ui.baseview{
-	addOption(id:string, value:any, show?:boolean, index?:number):void;
+	addOption(id:string|number, value:any, show?:boolean, index?:number):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:tabbarEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -6490,24 +7036,26 @@ interface tabbar extends webix.ui.baseview{
 	isEnabled():boolean;
 	isVisible():boolean;
 	mapEvent(map:any):void;
-	optionIndex(ID:string):number;
+	optionIndex(ID:string|number):number;
 	refresh():void;
-	removeOption(id:string):void;
-	render(id:string, data:any, type:string):void;
+	removeOption(id:string|number):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -6517,20 +7065,20 @@ interface tabbar extends webix.ui.baseview{
 	config: tabbarConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface tabviewConfig{
 	animate?: any;
 	borderless?: boolean;
 	cells?: any[];
 	cols?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	margin?: number;
 	maxHeight?: number;
@@ -6549,10 +7097,11 @@ interface tabviewConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type tabviewEventName ='onBindRequest'|'onDestruct';
 interface tabview extends webix.ui.baseview{
-	addView(view:any, index?:number):webix.ui.baseview;
+	addView(view:any):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:tabviewEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -6576,7 +7125,7 @@ interface tabview extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	reconstruct():void;
-	removeView(id:string):void;
+	removeView(id:string|number):void;
 	resize():void;
 	resizeChildren():void;
 	setValue(value:string):void;
@@ -6584,7 +7133,8 @@ interface tabview extends webix.ui.baseview{
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -6595,10 +7145,10 @@ interface tabview extends webix.ui.baseview{
 }
 interface templateConfig{
 	animate?: any;
-	autoheight?: any;
+	autoheight?: boolean;
 	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
+	content?: string|number|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -6607,7 +7157,7 @@ interface templateConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -6622,9 +7172,10 @@ interface templateConfig{
 	url?: string;
 	width?: number;
 }
+type templateEventName ='onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onBeforeLoad'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface template extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:templateEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -6639,15 +7190,16 @@ interface template extends webix.ui.baseview{
 	getParentView():any;
 	getScrollState():any;
 	getTopParentView():webix.ui.baseview;
+	getValues():void;
 	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	mapEvent(map:any):void;
 	parse(data:any, type:string):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	setContent(node:any):void;
@@ -6657,7 +7209,8 @@ interface template extends webix.ui.baseview{
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -6670,24 +7223,25 @@ interface template extends webix.ui.baseview{
 interface textConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	icon?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -6698,24 +7252,24 @@ interface textConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
 	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type textEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface text extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:textEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -6739,21 +7293,23 @@ interface text extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(config:any):HTMLElement;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -6763,29 +7319,29 @@ interface text extends webix.ui.baseview{
 	config: textConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface textareaConfig{
 	align?: string;
 	animate?: any;
-	attributes?: { [key: string]: any; };
+	attributes?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
-	bottomLabel?: any;
-	bottomPadding?: any;
+	bottomLabel?: string;
+	bottomPadding?: number;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputPadding?: number;
 	inputWidth?: number;
-	invalidMessage?: any;
+	invalidMessage?: string;
 	label?: string;
 	labelPosition?: string;
 	labelWidth?: number;
@@ -6796,24 +7352,23 @@ interface textareaConfig{
 	name?: string;
 	on?: any;
 	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	readonly?: boolean;
 	relatedAction?: string;
 	relatedView?: string;
 	required?: boolean;
-	suggest?: string|webix.ui.baseview;
+	suggest?: any;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
-	type?: string;
-	validate?: boolean;
+	validate?: WebixCallback;
 	validateEvent?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type textareaEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface textarea extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:textareaEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -6837,21 +7392,23 @@ interface textarea extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
+	setBottomText(text:string):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	validate():boolean;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
 	$render: WebixCallback;
 	$renderIcon: WebixCallback;
-	$renderInput(obj:any, html:string, id:string):string;
-	$renderLabel(config:any, id:string):string;
+	$renderInput(obj:any, html:string, id:string|number):string;
+	$renderLabel(config:any, id:string|number):string;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -6861,44 +7418,46 @@ interface textarea extends webix.ui.baseview{
 	config: textareaConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface toggleConfig{
 	align?: string;
 	animate?: any;
+	autowidth?: boolean;
 	borderless?: boolean;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	icon?: string;
+	id?: string|number;
 	inputHeight?: number;
 	inputWidth?: number;
-	label?: string;
-	labelPosition?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	name?: string;
+	offIcon?: string;
+	offLabel?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
+	onIcon?: string;
+	onLabel?: string;
+	popup?: string;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
 	type?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type toggleEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onChange'|'onDestruct'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface toggle extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:toggleEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -6922,7 +7481,7 @@ interface toggle extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
@@ -6930,9 +7489,11 @@ interface toggle extends webix.ui.baseview{
 	toggle():void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
-	$getValue():string;
+
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
+	$renderInput(config:any):HTMLElement;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
@@ -6942,13 +7503,14 @@ interface toggle extends webix.ui.baseview{
 	config: toggleConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface toolbarConfig{
 	animate?: any;
 	borderless?: boolean;
 	cols?: any[];
-	container?: HTMLElement;
+	complexData?: boolean;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -6959,7 +7521,7 @@ interface toolbarConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	isolate?: boolean;
 	margin?: number;
 	maxHeight?: number;
@@ -6980,10 +7542,11 @@ interface toolbarConfig{
 	visibleBatch?: string;
 	width?: number;
 }
+type toolbarEventName ='onAfterLoad'|'onAfterScroll'|'onAfterValidation'|'onBeforeLoad'|'onBeforeValidate'|'onBindRequest'|'onChange'|'onDestruct'|'onLoadError'|'onValidationError'|'onValidationSuccess'|'onValues';
 interface toolbar extends webix.ui.baseview{
 	addView(view:any, index?:number):webix.ui.baseview;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:toolbarEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -7010,13 +7573,14 @@ interface toolbar extends webix.ui.baseview{
 	isDirty():boolean;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	mapEvent(map:any):void;
+	markInvalid(name:string, state?:boolean|string):void;
 	parse(data:any, type:string):void;
 	reconstruct():void;
 	refresh():void;
-	removeView(id:string):void;
-	render(id:string, data:any, type:string):void;
+	removeView(id:string|number):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	resizeChildren():void;
 	scrollTo(x:number, y:number):void;
@@ -7026,8 +7590,9 @@ interface toolbar extends webix.ui.baseview{
 	showBatch(name:string):void;
 	unbind():void;
 	unblockEvent():void;
-	validate():boolean;
-	$getSize():any[];
+	validate(mode?:any):boolean;
+
+	$getSize: any[];
 	$height: number;
 	$setSize(x:number, y:number):boolean;
 	$skin: any;
@@ -7039,8 +7604,7 @@ interface toolbar extends webix.ui.baseview{
 interface tooltipConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	dx?: number;
@@ -7048,7 +7612,7 @@ interface tooltipConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
@@ -7057,9 +7621,10 @@ interface tooltipConfig{
 	template?: string|WebixCallback;
 	width?: number;
 }
+type tooltipEventName ='onAfterRender'|'onAfterScroll'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface tooltip extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:tooltipEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -7079,13 +7644,14 @@ interface tooltip extends webix.ui.baseview{
 	isEnabled():boolean;
 	isVisible():boolean;
 	mapEvent(map:any):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -7101,10 +7667,9 @@ interface treeConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datathrottle?: number;
 	datatype?: string;
 	disabled?: boolean;
@@ -7114,20 +7679,19 @@ interface treeConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean|string;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
 	onContext?: { [key: string]: any; };
 	onDblClick?: WebixCallback;
 	onMouseMove?: WebixCallback;
-	pager?: any;
 	ready?: WebixCallback;
 	removeMissed?: boolean;
 	rules?: any;
@@ -7144,22 +7708,23 @@ interface treeConfig{
 	url?: string;
 	width?: number;
 }
+type treeEventName ='onAfterAdd'|'onAfterClose'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterOpen'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeClose'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeOpen'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onItemCheck'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPartialRender'|'onPaste'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface tree extends webix.ui.baseview{
 	add(obj:any, index?:number, parentId?:string):string;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:treeEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
-	checkAll(id?:string):void;
+	checkAll(id?:string|number):void;
 	checkItem(id:string):void;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	close(id:string):void;
+	close(id:string|number):void;
 	closeAll():void;
-	copy(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
+	copy(sid:string|number, tindex:number, tobj?:webix.ui.baseview, details?:any):string|number;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
@@ -7167,56 +7732,57 @@ interface tree extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
-	getBranchIndex(id:string, parent?:string):number;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getBranchIndex(id:string|number, parent?:string|number):number;
 	getChecked():any[];
 	getChildViews():any[];
-	getFirstChildId(id:string):string;
-	getFirstId():string;
+	getFirstChildId(id:string|number):string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getNextSiblingId(id:string|number):string|number;
 	getNode():any;
 	getOpenItems():any[];
-	getParentId(id:string):string;
+	getParentId(id:string|number):string|number;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
+	getPrevId(id:string|number, step:number):string|number;
+	getPrevSiblingId(id:string|number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getState():any;
 	getTopParentView():webix.ui.baseview;
 	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	isBranch(id:string):boolean;
-	isBranchOpen(id:string):boolean;
-	isChecked(id:string):boolean;
+	isBranch(id:string|number):boolean;
+	isBranchOpen(id:string|number):boolean;
+	isChecked(id:string|number):boolean;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	loadBranch(id:string|number, callback:WebixCallback, url:string):void;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
 	moveSelection(direction:string):void;
-	open(id:string):void;
+	open(id:string|number, show?:boolean):void;
 	openAll():void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -7224,26 +7790,27 @@ interface tree extends webix.ui.baseview{
 	serialize():any;
 	setState(state:any):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	uncheckAll(id?:string):void;
+	uncheckAll(id?:string|number):void;
 	uncheckItem(id:string):void;
 	ungroup(mode:boolean):void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -7259,21 +7826,181 @@ interface tree extends webix.ui.baseview{
 	type: { [key: string]: any; };
 	types: { [key: string]: any; };
 }
+interface treemapConfig{
+	activeItem?: boolean;
+	animate?: any;
+	borderless?: boolean;
+	branch?: string;
+	click?: string|WebixCallback;
+	clipboard?: boolean|string;
+	container?: string|HTMLElement;
+	css?: string;
+	data?: string|any[];
+	dataFeed?: string|WebixCallback;
+	datathrottle?: number;
+	datatype?: string;
+	disabled?: boolean;
+	filterMode?: any;
+	gravity?: number;
+	header?: boolean;
+	headerHeight?: number;
+	headerTemplate?: string;
+	height?: number;
+	hidden?: boolean;
+	id?: string|number;
+	maxHeight?: number;
+	maxWidth?: number;
+	minHeight?: number;
+	minWidth?: number;
+	mouseEventDelay?: number;
+	multiselect?: boolean;
+	navigation?: boolean;
+	on?: any;
+	onClick?: { [key: string]: any; };
+	onContext?: { [key: string]: any; };
+	onDblClick?: WebixCallback;
+	onMouseMove?: WebixCallback;
+	pager?: any;
+	ready?: WebixCallback;
+	removeMissed?: boolean;
+	rules?: any;
+	save?: string;
+	scheme?: any;
+	scroll?: boolean|string;
+	scrollSpeed?: string;
+	select?: boolean|string;
+	subRender?: boolean;
+	template?: string|WebixCallback;
+	templateCopy?: WebixCallback;
+	threeState?: boolean;
+	tooltip?: any;
+	type?: any;
+	url?: string;
+	value?: string|WebixCallback;
+	width?: number;
+}
+type treemapEventName ='onAfterAdd'|'onAfterClose'|'onAfterContextMenu'|'onAfterDelete'|'onAfterLoad'|'onAfterOpen'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeClose'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeLoad'|'onBeforeOpen'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onFocus'|'onItemCheck'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPartialRender'|'onPaste'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
+interface treemap extends webix.ui.baseview{
+	add(obj:any, index?:number):string|number;
+	addCss(id:string|number, css:string, silent?:boolean):void;
+	adjust():void;
+	attachEvent(type:treemapEventName, functor:WebixCallback, id?:string):string|number;
+	bind(target:any, rule?:WebixCallback, format?:string):void;
+	blockEvent():void;
+	callEvent(name:string, params:any[]):boolean;
+	clearAll():void;
+	clearCss(css:string, silent?:boolean):void;
+	clearValidation():void;
+	close(id:string|number):void;
+	closeAll():void;
+	count():number;
+	customize(obj:any):void;
+	define(property:string, value:any):void;
+	destructor():void;
+	detachEvent(id:string):void;
+	disable():void;
+	enable():void;
+	exists(id:string|number):boolean;
+	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
+	getBranchIndex(id:string|number, parent?:string|number):number;
+	getChildViews():any[];
+	getFirstChildId(id:string|number):string;
+	getFirstId():string|number;
+	getFormView():webix.ui.baseview;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getNextSiblingId(id:string|number):string|number;
+	getNode():any;
+	getOpenItems():any[];
+	getPage():number;
+	getPager():any;
+	getParentId(id:string|number):string|number;
+	getParentView():any;
+	getPrevId(id:string|number, step:number):string|number;
+	getPrevSiblingId(id:string|number):string|number;
+	getScrollState():any;
+	getSelectedId(as_array:boolean):string|any[];
+	getSelectedItem(as_array:boolean):any;
+	getState():any;
+	getTopParentView():webix.ui.baseview;
+	group(config:any, mode:boolean):void;
+	hasCss(id:string|number, css:string):boolean;
+	hasEvent(name:string):boolean;
+	hide():void;
+	isBranch(id:string|number):boolean;
+	isBranchOpen(id:string|number):boolean;
+	isEnabled():boolean;
+	isSelected(id:string|number):boolean;
+	isVisible():boolean;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	loadBranch(id:string|number, callback:WebixCallback, url:string):void;
+	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
+	locate(e:Event):string|number;
+	mapEvent(map:any):void;
+	moveSelection(direction:string):void;
+	open(id:string|number, show?:boolean):void;
+	openAll():void;
+	parse(data:any, type:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
+	removeCss(id:string|number, css:string, silent?:boolean):void;
+	render(id:string|number, data:any, type:string):void;
+	resize():void;
+	scrollTo(x:number, y:number):void;
+	select(id:string|any[], preserve:boolean):void;
+	selectAll(from?:string, to?:string):void;
+	serialize():any;
+	setPage(page:number):void;
+	setState(state:any):void;
+	show(force?:boolean, animation?:boolean):void;
+	showBranch(branchId:string|number):void;
+	showItem(id:string|number):void;
+	sort(by:string, dir?:string, as?:string):void;
+	sync(source:any, filter:WebixCallback, silent:boolean):void;
+	unbind():void;
+	unblockEvent():void;
+	ungroup(mode:boolean):void;
+	unselect(id?:string):void;
+	unselectAll():void;
+	updateItem(id:string|number, data:any):void;
+	validate(id?:string):boolean;
+
+	$getSize: any[];
+	$height: number;
+	$scope: any;
+	$setSize(x:number, y:number):boolean;
+	$skin: any;
+	$view: HTMLElement;
+	$width: number;
+	config: treemapConfig;
+	name: string;
+	on_click: WebixCallback;
+	on_context: { [key: string]: any; };
+	on_dblclick: WebixCallback;
+	on_mouse_move: WebixCallback;
+	type: { [key: string]: any; };
+	types: { [key: string]: any; };
+}
 interface treetableConfig{
 	animate?: any;
+	areaselect?: boolean;
 	autoConfig?: boolean;
 	autoheight?: boolean;
 	autowidth?: boolean;
-	blockselect?: boolean;
+	blockselect?: boolean|string;
 	borderless?: boolean;
 	checkboxRefresh?: boolean;
 	clipboard?: boolean|string;
 	columnWidth?: number;
 	columns?: any[];
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
-	dataFeed?: string|WebixCallback;
 	datafetch?: number;
 	datathrottle?: number;
 	datatype?: string;
@@ -7298,10 +8025,11 @@ interface treetableConfig{
 	height?: number;
 	hidden?: boolean;
 	hover?: string;
-	id?: string;
+	id?: string|number;
 	leftSplit?: number;
 	liveValidation?: boolean;
 	loadahead?: number;
+	map?: any;
 	math?: boolean;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -7329,19 +8057,23 @@ interface treetableConfig{
 	rules?: any;
 	save?: string;
 	scheme?: any;
-	scroll?: boolean;
+	scroll?: boolean|string;
 	scrollAlignY?: boolean;
 	scrollX?: boolean;
 	scrollY?: boolean;
 	select?: boolean|string;
 	spans?: any[];
+	subRowHeight?: string;
+	subrow?: string;
+	subview?: webix.ui.baseview;
 	threeState?: boolean;
-	tooltip?: any;
+	tooltip?: boolean;
 	type?: any;
 	url?: string;
 	width?: number;
 	yCount?: number;
 }
+type treetableEventName ='onAfterAdd'|'onAfterAreaAdd'|'onAfterAreaRemove'|'onAfterBlockSelect'|'onAfterClose'|'onAfterColumnDrop'|'onAfterColumnDropOrder'|'onAfterColumnHide'|'onAfterColumnShow'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterEditStart'|'onAfterEditStop'|'onAfterFilter'|'onAfterLoad'|'onAfterOpen'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onAfterUnSelect'|'onAreaDrag'|'onBeforeAdd'|'onBeforeAreaAdd'|'onBeforeAreaRemove'|'onBeforeBlockSelect'|'onBeforeClose'|'onBeforeColumnDrag'|'onBeforeColumnDrop'|'onBeforeColumnDropOrder'|'onBeforeColumnHide'|'onBeforeColumnShow'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeEditStart'|'onBeforeEditStop'|'onBeforeFilter'|'onBeforeLoad'|'onBeforeOpen'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBeforeUnSelect'|'onBindRequest'|'onBlur'|'onCheck'|'onCollectValues'|'onColumnResize'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onHeaderClick'|'onItemCheck'|'onItemClick'|'onItemDblClick'|'onKeyPress'|'onLiveEdit'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onResize'|'onRowResize'|'onScrollX'|'onScrollY'|'onSelectChange'|'onStructureLoad'|'onStructureUpdate'|'onSubViewClose'|'onSubViewCreate'|'onSubViewOpen'|'onSubViewRender'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface treetable extends webix.ui.baseview{
 	add(obj:any, index?:number, parentId?:string):string;
 	addCellCss(id:string, name:string, css:string):void;
@@ -7350,20 +8082,20 @@ interface treetable extends webix.ui.baseview{
 	adjust():void;
 	adjustColumn(id:string|number, header?:string):void;
 	adjustRowHeight(columnId:string, silent:boolean):void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:treetableEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
-	checkAll(id?:string):void;
+	checkAll(id?:string|number):void;
 	checkItem(id:string):void;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	close(id:string):void;
+	close(id:string|number):void;
 	closeAll():void;
-	collectValues(id:string):any[];
-	columnId(index:number):string;
-	copy(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
+	collectValues(id:string|number):any[];
+	columnId(index:number):string|number;
+	copy(sid:string|number, tindex:number, tobj?:webix.ui.baseview, details?:any):string|number;
 	count():number;
 	define(property:string, value:any):void;
 	destructor():void;
@@ -7379,120 +8111,119 @@ interface treetable extends webix.ui.baseview{
 	editRow(id:string):void;
 	editStop():void;
 	enable():void;
-	exists(id:string):boolean;
-	exportToExcel(url?:string):void;
-	exportToPDF(url?:string):void;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
 	filterByAll():void;
 	find(criterion:WebixCallback, first?:boolean):any;
 	focusEditor():void;
-	getBranchIndex(id:string, parent?:string):number;
+	getBranchIndex(id:string|number, parent?:string|number):number;
 	getChecked():any[];
 	getChildViews():any[];
 	getColumnConfig(id:string):any;
-	getColumnIndex(id:string):number;
+	getColumnIndex(id:string|number):number;
 	getEditState():any;
 	getEditor(row?:any, column?:string|number):any;
 	getEditorValue():string;
-	getFilter(columnID:string):any;
-	getFirstChildId(id:string):string;
-	getFirstId():string;
+	getFilter(columnID:string|number):any;
+	getFirstChildId(id:string|number):string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getHeaderContent(id:string):{ [key: string]: any; };
+	getHeaderContent(id:string|number):{ [key: string]: any; };
 	getHeaderNode(columnId:string, rowIndex?:number):HTMLElement;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
-	getNextSiblingId(id:any):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
+	getNextSiblingId(id:string|number):string|number;
 	getNode():any;
 	getOpenItems():any[];
 	getPage():number;
 	getPager():any;
-	getParentId(id:string):string;
+	getParentId(id:string|number):string|number;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
-	getPrevSiblingId(id:any):string;
+	getPrevId(id:string|number, step:number):string|number;
+	getPrevSiblingId(id:string|number):string|number;
 	getScrollState():any;
-	getSelectedId(asArray?:boolean, asString?:boolean):any;
-	getSelectedItem(mode?:boolean):void;
+	getSelectedId(asArray:boolean, asString:boolean):any;
+	getSelectedItem(as_array?:boolean):any;
 	getState():any;
-	getText(rowid:string, colid:string):string;
+	getText(rowid:string|number, colid:string|number):string;
 	getTopParentView():webix.ui.baseview;
 	getVisibleCount():number;
 	group(config:any, mode:boolean):void;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
-	hideColumn(id:string):void;
+	hideColumn(id:string|number):void;
 	hideOverlay():void;
-	isBranch(id:string):boolean;
-	isBranchOpen(id:string):boolean;
-	isChecked(id:string):boolean;
-	isColumnVisible(id:string):boolean;
+	isBranch(id:string|number):boolean;
+	isBranchOpen(id:string|number):boolean;
+	isChecked(id:string|number):boolean;
+	isColumnVisible(id:string|number):boolean;
 	isEnabled():boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
-	loadBranch(id:string, callback:WebixCallback, url:string):void;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
+	loadBranch(id:string|number, callback:WebixCallback, url:string):void;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
 	locate(node:HTMLElement|Event):any;
 	mapCells(startrow:number, startcol:string, numrows:number, numcols:number, callback:WebixCallback):void;
 	mapEvent(map:any):void;
-	markSorting(column_id:string, dir:string):void;
-	move(sid:string, tindex:number, tobj?:webix.ui.baseview, details?:any):string;
-	moveBottom(id:string):void;
+	markSorting(column_id:string, direction:string):void;
+	move(sid:string|number, tindex:number, tobj?:webix.ui.baseview, details?:any):string|number;
+	moveBottom(id:string|number):void;
 	moveColumn(id:string, index:number):void;
-	moveDown(id:string, step:number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
-	open(id:string):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
+	open(id:string|number, show?:boolean):void;
 	openAll():void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	refreshColumns(config?:any[]):void;
-	refreshFilter(id:string):void;
+	refresh(id?:string|number):void;
+	refreshColumns(config?:any[], reset?:boolean):void;
+	refreshFilter(id:string|number):void;
 	refreshHeaderContent():void;
 	registerFilter(node:HTMLElement, config:any, obj:any):void;
-	remove(id:string):void;
+	remove(id:string|number):void;
 	removeCellCss(id:string, name:string, css_name:string):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
 	removeRowCss(id:string, css_name:string):void;
-	render(id:string, data:any, operation:string):void;
+	render(id:string|number, data:any, operation:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	serialize():any;
-	setColumnWidth(id:string, width:number):void;
+	setColumnWidth(id:string|number, width:number):void;
 	setPage(page:number):void;
-	setRowHeight(id:string, height:number):void;
+	setRowHeight(id:string|number, height:number):void;
 	setState(state:any):void;
 	show(force?:boolean, animation?:boolean):void;
 	showCell(row:string, column:string):void;
-	showColumn(id:string):void;
-	showColumnBatch(batch:string|number):void;
-	showItem(id:string):void;
+	showColumn(id:string|number):void;
+	showColumnBatch(batch:string|number, preserve:boolean):void;
+	showItem(id:string|number):void;
 	showItemByIndex(index:number):void;
 	showOverlay(message:string):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
-	uncheckAll(id?:string):void;
+	uncheckAll(id?:string|number):void;
 	uncheckItem(id:string):void;
 	ungroup(mode:boolean):void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
-	validateEditor(id?:string):boolean;
+	validateEditor(id?:string|number):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -7506,7 +8237,7 @@ interface treetable extends webix.ui.baseview{
 	on_context: { [key: string]: any; };
 	on_dblclick: WebixCallback;
 	on_mouse_move: WebixCallback;
-	waitData: PromisedData;
+	waitData: webix.promise;
 }
 interface unitlistConfig{
 	animate?: any;
@@ -7515,7 +8246,7 @@ interface unitlistConfig{
 	borderless?: boolean;
 	click?: string|WebixCallback;
 	clipboard?: boolean|string;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	data?: string|any[];
 	dataFeed?: string|WebixCallback;
@@ -7528,14 +8259,14 @@ interface unitlistConfig{
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	layout?: string;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
 	mouseEventDelay?: number;
-	multiselect?: any;
+	multiselect?: boolean;
 	navigation?: boolean;
 	on?: any;
 	onClick?: { [key: string]: any; };
@@ -7562,18 +8293,19 @@ interface unitlistConfig{
 	xCount?: number;
 	yCount?: number;
 }
+type unitlistEventName ='onAfterAdd'|'onAfterContextMenu'|'onAfterDelete'|'onAfterDrop'|'onAfterLoad'|'onAfterRender'|'onAfterScroll'|'onAfterSelect'|'onAfterSort'|'onBeforeAdd'|'onBeforeContextMenu'|'onBeforeDelete'|'onBeforeDrag'|'onBeforeDragIn'|'onBeforeDrop'|'onBeforeDropOut'|'onBeforeLoad'|'onBeforeRender'|'onBeforeSelect'|'onBeforeSort'|'onBindRequest'|'onBlur'|'onDataRequest'|'onDataUpdate'|'onDestruct'|'onDragOut'|'onFocus'|'onItemClick'|'onItemDblClick'|'onItemRender'|'onKeyPress'|'onLoadError'|'onLongTouch'|'onMouseMove'|'onMouseMoving'|'onMouseOut'|'onPaste'|'onSelectChange'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onValidationError'|'onValidationSuccess'|'onViewResize';
 interface unitlist extends webix.ui.baseview{
-	add(obj:any, index?:number):string;
+	add(obj:any, index?:number):string|number;
 	addCss(id:string|number, css:string, silent?:boolean):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:unitlistEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
 	clearAll():void;
 	clearCss(css:string, silent?:boolean):void;
 	clearValidation():void;
-	copy(sid:string, tindex:number, tobj?:any, details?:any):void;
+	copy(sid:string|number, tindex:number, tobj?:any, details?:any):void;
 	count():number;
 	customize(obj:any):void;
 	define(property:string, value:any):void;
@@ -7581,50 +8313,51 @@ interface unitlist extends webix.ui.baseview{
 	detachEvent(id:string):void;
 	disable():void;
 	enable():void;
-	exists(id:string):boolean;
+	exists(id:string|number):boolean;
 	filter(text:string|WebixTemplate|WebixCallback, value:string, preserve:boolean):void;
+	find(criterion:WebixCallback, first?:boolean):any;
 	getChildViews():any[];
-	getFirstId():string;
+	getFirstId():string|number;
 	getFormView():webix.ui.baseview;
-	getIdByIndex(index:number):string;
-	getIndexById(id:string):number;
-	getItem(id:string):any;
-	getItemNode(id:string):void;
-	getLastId():string;
-	getNextId(id:string, step:number):string;
+	getIdByIndex(index:number):string|number;
+	getIndexById(id:string|number):number;
+	getItem(id:string|number):any;
+	getItemNode(id:string|number):void;
+	getLastId():string|number;
+	getNextId(id:string|number, step:number):string|number;
 	getNode():any;
 	getPage():number;
 	getPager():any;
 	getParentView():any;
-	getPrevId(id:string, step:number):string;
+	getPrevId(id:string|number, step:number):string|number;
 	getScrollState():any;
 	getSelectedId(as_array:boolean):string|any[];
-	getSelectedItem(as_array?:boolean):any;
+	getSelectedItem(as_array:boolean):any;
 	getTopParentView():webix.ui.baseview;
 	getUnitList(name:string):any[];
 	getUnits():any[];
 	getVisibleCount():number;
-	hasCss(id:string, css:string):boolean;
+	hasCss(id:string|number, css:string):boolean;
 	hasEvent(name:string):boolean;
 	hide():void;
 	isEnabled():boolean;
-	isSelected(id:string):boolean;
+	isSelected(id:string|number):boolean;
 	isVisible():boolean;
-	load(url:string, type?:string, callback?:WebixCallback):PromisedData;
+	load(url:string, type?:string, callback?:WebixCallback):webix.promise;
 	loadNext(count:number, start:number, callback:WebixCallback, url:string, now:boolean):void;
-	locate(e:Event):string;
+	locate(e:Event):string|number;
 	mapEvent(map:any):void;
 	move(sid:string, tindex:number, tobj?:any, details?:any):string;
-	moveBottom(id:string):void;
-	moveDown(id:string, step:number):void;
+	moveBottom(id:string|number):void;
+	moveDown(id:string|number, step:number):void;
 	moveSelection(direction:string):void;
-	moveTop(id:string):void;
-	moveUp(id:string, step:number):void;
+	moveTop(id:string|number):void;
+	moveUp(id:string|number, step:number):void;
 	parse(data:any, type:string):void;
-	refresh(id?:string):void;
-	remove(id:string):void;
+	refresh(id?:string|number):void;
+	remove(id:string|number):void;
 	removeCss(id:string|number, css:string, silent?:boolean):void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	scrollTo(x:number, y:number):void;
 	select(id:string|any[], preserve:boolean):void;
@@ -7632,23 +8365,24 @@ interface unitlist extends webix.ui.baseview{
 	serialize():any;
 	setPage(page:number):void;
 	show(force?:boolean, animation?:boolean):void;
-	showItem(id:string):void;
+	showItem(id:string|number):void;
 	sort(by:string, dir?:string, as?:string):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
 	unselect(id?:string):void;
 	unselectAll():void;
-	updateItem(id:string, data:any):void;
+	updateItem(id:string|number, data:any):void;
 	validate(id?:string):boolean;
+
 	$drag(source:HTMLElement, ev:Event):string;
 	$dragHTML: WebixCallback;
 	$dragIn(source:HTMLElement, target:HTMLElement, ev:Event):HTMLElement;
 	$dragMark(context:any, ev:Event):boolean;
 	$dragOut(source:HTMLElement, old_target:HTMLElement, new_target:HTMLElement, ev:Event):void;
-	$drop(source:HTMLElement, target:HTMLElement, ev:any):void;
+	$drop(source:HTMLElement, target:HTMLElement, ev:Event):void;
 	$dropAllow: WebixCallback;
-	$getSize():any[];
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -7669,23 +8403,22 @@ interface uploaderConfig{
 	animate?: any;
 	apiOnly?: boolean;
 	autosend?: boolean;
+	autowidth?: boolean;
 	borderless?: boolean;
 	click?: WebixCallback;
-	container?: HTMLElement;
-	content?: string|HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	formData?: { [key: string]: any; };
-	getValue():string;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
 	hotkey?: string;
-	id?: string;
+	id?: string|number;
 	inputHeight?: number;
+	inputName?: string;
 	inputWidth?: number;
 	label?: string;
-	labelPosition?: string;
 	link?: string;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -7694,20 +8427,19 @@ interface uploaderConfig{
 	multiple?: boolean;
 	name?: string;
 	on?: any;
-	placeholder?: string;
-	popup?: any;
+	popup?: string;
 	tabFocus?: boolean;
-	template?: string|WebixCallback;
 	tooltip?: string;
 	type?: string;
-	value?: string;
+	value?: string|number;
 	width?: number;
 }
+type uploaderEventName ='onAfterFileAdd'|'onAfterRender'|'onAfterScroll'|'onBeforeFileAdd'|'onBeforeRender'|'onBindRequest'|'onBlur'|'onDestruct'|'onFileUpload'|'onFileUploadError'|'onFocus'|'onItemClick'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onUploadComplete'|'onViewResize';
 interface uploader extends webix.ui.baseview{
 	addDropZone(element:HTMLElement):void;
 	addFile(name:string, size:number, type?:string):void;
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:uploaderEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	blur():void;
@@ -7733,48 +8465,53 @@ interface uploader extends webix.ui.baseview{
 	isVisible():boolean;
 	mapEvent(map:any):void;
 	refresh():void;
-	render(id:string, data:any, type:string):void;
+	render(id:string|number, data:any, type:string):void;
 	resize():void;
 	send(id:number|string|WebixCallback, details:any):void;
 	setValue(value:string):void;
 	show(force?:boolean, animation?:boolean):void;
-	stopUpload(id:string):void;
+	stopUpload(id:string|number):void;
 	sync(source:any, filter:WebixCallback, silent:boolean):void;
 	unbind():void;
 	unblockEvent():void;
+
 	$cssName: string;
-	$getSize():any[];
-	$getValue():string;
+	$getSize: any[];
+	$getValue: string;
 	$height: number;
+	$onUploadComplete: WebixCallback;
+	$renderInput(config:any):HTMLElement;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
 	$setValue(value:string):void;
 	$skin: any;
+	$updateProgress: WebixCallback;
 	$view: HTMLElement;
 	$width: number;
 	config: uploaderConfig;
 	name: string;
 	on_click: WebixCallback;
-	touchable: any;
+	touchable: boolean;
 }
 interface videoConfig{
 	animate?: any;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	controls?: boolean;
 	css?: string;
 	disabled?: boolean;
 	gravity?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	maxHeight?: number;
 	maxWidth?: number;
 	minHeight?: number;
 	minWidth?: number;
-	src?: any;
+	src?: string;
 	width?: number;
 }
+type videoEventName ='onAfterScroll'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onKeyPress'|'onLongTouch'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewResize';
 interface video extends webix.ui.baseview{
 	adjust():void;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
@@ -7794,7 +8531,8 @@ interface video extends webix.ui.baseview{
 	resize():void;
 	show(force?:boolean, animation?:boolean):void;
 	unbind():void;
-	$getSize():any[];
+
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -7810,7 +8548,7 @@ interface windowConfig{
 	autofocus?: boolean;
 	body?: string|webix.ui.baseview;
 	borderless?: boolean;
-	container?: HTMLElement;
+	container?: string|HTMLElement;
 	css?: string;
 	disabled?: boolean;
 	fullscreen?: boolean;
@@ -7819,7 +8557,7 @@ interface windowConfig{
 	headHeight?: number;
 	height?: number;
 	hidden?: boolean;
-	id?: string;
+	id?: string|number;
 	left?: number;
 	maxHeight?: number;
 	maxWidth?: number;
@@ -7831,13 +8569,16 @@ interface windowConfig{
 	padding?: any;
 	position?: string|WebixCallback;
 	relative?: string;
+	resize?: boolean;
+	toFront?: boolean;
 	top?: number;
 	width?: number;
 	zIndex?: number;
 }
+type windowEventName ='onAfterScroll'|'onBeforeShow'|'onBindRequest'|'onBlur'|'onDestruct'|'onFocus'|'onHide'|'onKeyPress'|'onLongTouch'|'onShow'|'onSwipeX'|'onSwipeY'|'onTimedKeyPress'|'onTouchEnd'|'onTouchMove'|'onTouchStart'|'onViewMove'|'onViewMoveEnd'|'onViewResize';
 interface window extends webix.ui.baseview{
 	adjust():void;
-	attachEvent(type:string, functor:WebixCallback, id?:string):string;
+	attachEvent(type:windowEventName, functor:WebixCallback, id?:string):string|number;
 	bind(target:any, rule?:WebixCallback, format?:string):void;
 	blockEvent():void;
 	callEvent(name:string, params:any[]):boolean;
@@ -7862,10 +8603,11 @@ interface window extends webix.ui.baseview{
 	resize():void;
 	resizeChildren():void;
 	setPosition(x:number, y:number):void;
-	show(force?:boolean, animation?:boolean):void;
+	show(node?:HTMLElement, position?:any, point?:string):void;
 	unbind():void;
 	unblockEvent():void;
-	$getSize():any[];
+	show(force:boolean,animation:boolean):void;
+	$getSize: any[];
 	$height: number;
 	$scope: any;
 	$setSize(x:number, y:number):boolean;
@@ -7878,4 +8620,4 @@ interface window extends webix.ui.baseview{
 
 }}
 
-declare function $$(id: string|Event|HTMLElement):webix.ui.baseview;
+declare function $$(id: string | Event | HTMLElement): webix.ui.baseview;
\ No newline at end of file
diff --git a/weighted/weighted-tests.ts b/weighted/weighted-tests.ts
new file mode 100644
index 0000000000..8b8b828f0a
--- /dev/null
+++ b/weighted/weighted-tests.ts
@@ -0,0 +1,30 @@
+/// <reference path="./weighted.d.ts" />
+import * as weighted from 'weighted';
+
+function testSet() {
+    var options = ['Wake Up', 'Snooze Alarm'];
+    var weights = [0.25, 0.75];
+
+    console.log('Decision:', weighted.select(options, weights));
+}
+
+function testObj() {
+    var options = {
+        'Wake Up': 0.25,
+        'Snooze Alarm': 0.75
+    };
+
+    console.log('Decision:', weighted.select(options));
+}
+
+function testOverrideRand() {
+    var options = ['Wake Up', 'Snooze Alarm'];
+	var weights = [0.25, 0.75];
+
+    function rand() {
+        return 4; // chosen by fair dice roll.
+                  // guaranteed to be random.  
+    }
+
+    console.log('Decision:', weighted.select(options, weights, rand));
+}
diff --git a/weighted/weighted.d.ts b/weighted/weighted.d.ts
new file mode 100644
index 0000000000..3f479ef0c1
--- /dev/null
+++ b/weighted/weighted.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for weighted
+// Project: https://github.com/Schoonology/weighted
+// Definitions by: Craig Citro <https://github.com/ccitro>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'weighted' {
+    export interface RandomFunc {
+        (): Number;
+    }  
+
+    export function select<T> (set: T[], weights: Number[], rand?: RandomFunc): T;
+    export function select<T> (obj: Object, rand?: RandomFunc): T;
+}
\ No newline at end of file
diff --git a/why-did-you-update/why-did-you-update-tests.ts b/why-did-you-update/why-did-you-update-tests.ts
new file mode 100644
index 0000000000..7c8432d61c
--- /dev/null
+++ b/why-did-you-update/why-did-you-update-tests.ts
@@ -0,0 +1,8 @@
+/// <reference path="./why-did-you-update.d.ts" />
+/// <reference path="../react/react.d.ts" />
+
+import * as React from "react";
+import {whyDidYouUpdate} from "why-did-you-update";
+
+whyDidYouUpdate(React);
+whyDidYouUpdate(React, { include: /^pure/, exclude: /^Connect/ });
diff --git a/why-did-you-update/why-did-you-update.d.ts b/why-did-you-update/why-did-you-update.d.ts
new file mode 100644
index 0000000000..da94eddb3e
--- /dev/null
+++ b/why-did-you-update/why-did-you-update.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for why-did-you-update v0.0.8
+// Project: https://github.com/garbles/why-did-you-update
+// Definitions by: rhysd <https://rhysd.github.io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../react/react.d.ts" />
+
+declare module "why-did-you-update" {
+	interface Options {
+		include?: RegExp;
+		exclude?: RegExp;
+	}
+	export function whyDidYouUpdate(react: typeof __React, options?: Options): void;
+}
+
diff --git a/yargs/yargs-tests.ts b/yargs/yargs-tests.ts
index a049af8cb3..14509d2072 100644
--- a/yargs/yargs-tests.ts
+++ b/yargs/yargs-tests.ts
@@ -67,14 +67,14 @@ function default_singles() {
 		.default('x', 10)
 		.default('y', 10)
 		.argv
-	;
+		;
 	console.log(argv.x + argv.y);
 }
 function default_hash() {
 	var argv = yargs
 		.default({ x: 10, y: 10 })
 		.argv
-	;
+		;
 	console.log(argv.x + argv.y);
 }
 
@@ -83,7 +83,7 @@ function boolean_single() {
 	var argv = yargs
 		.boolean('v')
 		.argv
-	;
+		;
 	console.dir(argv.v);
 	console.dir(argv._);
 }
@@ -91,7 +91,7 @@ function boolean_double() {
 	var argv = yargs
 		.boolean(['x', 'y', 'z'])
 		.argv
-	;
+		;
 	console.dir([argv.x, argv.y, argv.z]);
 	console.dir(argv._);
 }
@@ -105,7 +105,7 @@ function line_count() {
 		.alias('f', 'file')
 		.describe('f', 'Load a file')
 		.argv
-	;
+		;
 }
 
 // Below are tests for individual methods.
@@ -131,13 +131,13 @@ function Argv$options() {
 			nargs: 3
 		})
 		.argv
-	;
+		;
 
 	var argv2 = yargs
 		.alias('f', 'file')
 		.default('f', '/etc/passwd')
 		.argv
-	;
+		;
 }
 
 function Argv$global() {
@@ -168,17 +168,17 @@ function Argv$array() {
 function Argv$nargs() {
 	var argv = yargs
 		.nargs('foo', 12)
-		.nargs({'bing': 3, 'bang': 2, 'buzz': 4})
+		.nargs({ 'bing': 3, 'bang': 2, 'buzz': 4 })
 }
 
 function Argv$choices() {
 	// example from documentation
 	var argv = yargs
-	  .alias('i', 'ingredient')
-	  .describe('i', 'choose your sandwich ingredients')
-	  .choices('i', ['peanut-butter', 'jelly', 'banana', 'pickles'])
-	  .help('help')
-	  .argv
+		.alias('i', 'ingredient')
+		.describe('i', 'choose your sandwich ingredients')
+		.choices('i', ['peanut-butter', 'jelly', 'banana', 'pickles'])
+		.help('help')
+		.argv
 }
 
 function command() {
@@ -190,8 +190,19 @@ function command() {
 				alias: 'force',
 				description: 'yar, it usually be a bad idea'
 			})
-			.help('help')
-			.argv;
+				.help('help')
+				.argv;
+		})
+		.command("build", "arghh, build it mate", {
+			tag: {
+				default: true,
+				demand: true,
+				description: "Tag the build, mate!"
+			},
+			publish: {
+				default: false,
+				description:"Should i publish?"
+			}
 		})
 		.help('help')
 		.argv;
@@ -214,7 +225,7 @@ function completion_sync() {
 function completion_async() {
 	var argv = yargs
 		.completion('completion', (current, argv, done) => {
-			setTimeout(function() {
+			setTimeout(function () {
 				done([
 					'apple',
 					'banana'
@@ -257,16 +268,16 @@ function Argv$version() {
 		.version('1.0.0', '--version', 'description');
 
 	var argv4 = yargs
-		.version( function() { return '1.0.0'; }, '--version', 'description');
+		.version(function () { return '1.0.0'; }, '--version', 'description');
 }
 
 function Argv$locale() {
 	var argv = yargs
 		.usage('./$0 - follow ye instructions true')
 		.option('option', {
-		alias: 'o',
-		describe: "'tis a mighty fine option",
-		demand: true
+			alias: 'o',
+			describe: "'tis a mighty fine option",
+			demand: true
 		})
 		.command('run', "Arrr, ya best be knowin' what yer doin'")
 		.example('$0 run foo', "shiver me timbers, here's an example for ye")
@@ -298,7 +309,7 @@ function Argv$reset() {
 			.argv
 
 		console.log('hello!');
-	} else if (command === 'world'){
+	} else if (command === 'world') {
 		ya.reset()
 			.usage('$0 world')
 			.help('h')
diff --git a/yargs/yargs.d.ts b/yargs/yargs.d.ts
index 4e6ef109ec..7dc1ef2319 100644
--- a/yargs/yargs.d.ts
+++ b/yargs/yargs.d.ts
@@ -21,7 +21,7 @@ declare module "yargs" {
 			alias(shortName: string, longName: string): Argv;
 			alias(aliases: { [shortName: string]: string }): Argv;
 			alias(aliases: { [shortName: string]: string[] }): Argv;
-			
+
 			array(key: string): Argv;
 			array(keys: string[]): Argv;
 
@@ -64,7 +64,11 @@ declare module "yargs" {
 			usage(options?: { [key: string]: Options }): Argv;
 
 			command(command: string, description: string): Argv;
-			command(command: string, description: string, fn: (args: Argv) => void): Argv;
+			command(command: string, description: string, handler: (args: Argv) => void): Argv;
+			command(command: string, description: string, builder: (args: Argv) => Options): Argv;
+			command(command: string, description: string, builder: { [optionName: string]: Options }): Argv;
+			command(command: string, description: string, builder: { [optionName: string]: Options }, handler: (args: Argv) => void): Argv;
+			command(command: string, description: string, builder: (args: Argv) => Options, handler: (args: Argv) => void): Argv;
 
 			completion(cmd: string, fn?: SyncCompletionFunction): Argv;
 			completion(cmd: string, description?: string, fn?: SyncCompletionFunction): Argv;
@@ -93,7 +97,7 @@ declare module "yargs" {
 
 			help(): string;
 			help(option: string, description?: string): Argv;
-			
+
 			env(prefix?: string): Argv;
 			env(enable: boolean): Argv;
 
@@ -108,13 +112,13 @@ declare module "yargs" {
 			showHelp(func?: (message: string) => any): Argv;
 
 			exitProcess(enabled:boolean): Argv;
-			
+
 			global(key: string): Argv;
 			global(keys: string[]): Argv;
-			
+
 			group(key: string, groupName: string): Argv;
 			group(keys: string[], groupName: string): Argv;
-			
+
 			nargs(key: string, count: number): Argv;
 			nargs(nargs: { [key: string]: number }): Argv;
 
diff --git a/z-schema/z-schema.d.ts b/z-schema/z-schema.d.ts
index 750abd2870..317a92247c 100644
--- a/z-schema/z-schema.d.ts
+++ b/z-schema/z-schema.d.ts
@@ -37,6 +37,11 @@ declare namespace ZSchema {
     }
 
     export class Validator {
+        public static registerFormat(name: string, validator: (value: any) => boolean): void;
+        public static unregisterFormat(name: string): void;
+        public static getRegisteredFormats(): string[];
+        public static getDefaultOptions(): Options;
+    
         constructor(options: Options);
 
         /**