diff --git a/addons/xterm-addon-attach/src/AttachAddon.ts b/addons/xterm-addon-attach/src/AttachAddon.ts
index 7fd8df29..e650b9b2 100644
--- a/addons/xterm-addon-attach/src/AttachAddon.ts
+++ b/addons/xterm-addon-attach/src/AttachAddon.ts
@@ -6,12 +6,13 @@
  */
 
 import { Terminal, IDisposable, ITerminalAddon } from 'xterm';
+import { AttachAddon as IAttachApi } from 'xterm-addon-attach';
 
 interface IAttachOptions {
   bidirectional?: boolean;
 }
 
-export class AttachAddon implements ITerminalAddon {
+export class AttachAddon implements ITerminalAddon , IAttachApi {
   private _socket: WebSocket;
   private _bidirectional: boolean;
   private _disposables: IDisposable[] = [];
diff --git a/addons/xterm-addon-attach/src/tsconfig.json b/addons/xterm-addon-attach/src/tsconfig.json
index 7e68574d..dd9e145c 100644
--- a/addons/xterm-addon-attach/src/tsconfig.json
+++ b/addons/xterm-addon-attach/src/tsconfig.json
@@ -13,7 +13,12 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "xterm-addon-attach": [
+        "../typings/xterm-addon-attach.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
diff --git a/addons/xterm-addon-canvas/src/CanvasAddon.ts b/addons/xterm-addon-canvas/src/CanvasAddon.ts
index 91438a4c..8f3ed758 100644
--- a/addons/xterm-addon-canvas/src/CanvasAddon.ts
+++ b/addons/xterm-addon-canvas/src/CanvasAddon.ts
@@ -11,8 +11,9 @@ import { setTraceLogger } from 'common/services/LogService';
 import { IBufferService, IDecorationService, ILogService } from 'common/services/Services';
 import { ITerminalAddon, Terminal } from 'xterm';
 import { CanvasRenderer } from './CanvasRenderer';
+import { CanvasAddon as ICanvasApi } from 'xterm-addon-canvas';
 
-export class CanvasAddon extends Disposable implements ITerminalAddon {
+export class CanvasAddon extends Disposable implements ITerminalAddon , ICanvasApi {
   private _terminal?: Terminal;
   private _renderer?: CanvasRenderer;
 
@@ -65,4 +66,8 @@ export class CanvasAddon extends Disposable implements ITerminalAddon {
       this._renderer = undefined;
     }));
   }
+
+  public clearTextureAtlas(): void {
+    this._renderer?.clearTextureAtlas();
+  }
 }
diff --git a/addons/xterm-addon-canvas/src/tsconfig.json b/addons/xterm-addon-canvas/src/tsconfig.json
index f6fb08a7..eb64d9f8 100644
--- a/addons/xterm-addon-canvas/src/tsconfig.json
+++ b/addons/xterm-addon-canvas/src/tsconfig.json
@@ -17,6 +17,9 @@
       ],
       "browser/*": [
         "../../../src/browser/*"
+      ],
+      "xterm-addon-canvas": [
+        "../typings/xterm-addon-canvas.d.ts"
       ]
     },
     "strict": true,
diff --git a/addons/xterm-addon-fit/src/FitAddon.ts b/addons/xterm-addon-fit/src/FitAddon.ts
index f7245462..a3fd39b6 100644
--- a/addons/xterm-addon-fit/src/FitAddon.ts
+++ b/addons/xterm-addon-fit/src/FitAddon.ts
@@ -5,6 +5,7 @@
 
 import { Terminal, ITerminalAddon } from 'xterm';
 import { IRenderDimensions } from 'browser/renderer/shared/Types';
+import { FitAddon as IFitApi } from 'xterm-addon-fit';
 
 interface ITerminalDimensions {
   /**
@@ -21,7 +22,7 @@ interface ITerminalDimensions {
 const MINIMUM_COLS = 2;
 const MINIMUM_ROWS = 1;
 
-export class FitAddon implements ITerminalAddon {
+export class FitAddon implements ITerminalAddon , IFitApi {
   private _terminal: Terminal | undefined;
 
   public activate(terminal: Terminal): void {
diff --git a/addons/xterm-addon-fit/src/tsconfig.json b/addons/xterm-addon-fit/src/tsconfig.json
index 668f910b..dac0d618 100644
--- a/addons/xterm-addon-fit/src/tsconfig.json
+++ b/addons/xterm-addon-fit/src/tsconfig.json
@@ -17,6 +17,9 @@
     "paths": {
       "browser/*": [
         "../../../src/browser/*"
+      ],
+      "xterm-addon-fit": [
+        "../typings/xterm-addon-fit.d.ts"
       ]
     }
   },
diff --git a/addons/xterm-addon-image/src/ImageAddon.ts b/addons/xterm-addon-image/src/ImageAddon.ts
index bb633e6b..8e5d4cac 100644
--- a/addons/xterm-addon-image/src/ImageAddon.ts
+++ b/addons/xterm-addon-image/src/ImageAddon.ts
@@ -9,7 +9,7 @@ import { ImageRenderer } from './ImageRenderer';
 import { ImageStorage, CELL_SIZE_DEFAULT } from './ImageStorage';
 import { SixelHandler } from './SixelHandler';
 import { ITerminalExt, IImageAddonOptions, IResetHandler } from './Types';
-
+import { ImageAddon as IImageApi } from 'xterm-addon-image'
 
 // default values of addon ctor options
 const DEFAULT_OPTIONS: IImageAddonOptions = {
@@ -48,7 +48,7 @@ const enum GaStatus {
 }
 
 
-export class ImageAddon implements ITerminalAddon {
+export class ImageAddon implements ITerminalAddon , IImageApi {
   private _opts: IImageAddonOptions;
   private _defaultOpts: IImageAddonOptions;
   private _storage: ImageStorage | undefined;
diff --git a/addons/xterm-addon-image/src/tsconfig.json b/addons/xterm-addon-image/src/tsconfig.json
index da519e17..cd961758 100644
--- a/addons/xterm-addon-image/src/tsconfig.json
+++ b/addons/xterm-addon-image/src/tsconfig.json
@@ -14,7 +14,8 @@
     "baseUrl": ".",
     "paths": {
       "browser/*": [ "../../../src/browser/*" ],
-      "common/*": [ "../../../src/common/*" ]
+      "common/*": [ "../../../src/common/*" ],
+      "xterm-addon-image": [ "../typings/xterm-addon-image.d.ts" ]
     }
   },
   "include": [
diff --git a/addons/xterm-addon-ligatures/src/LigaturesAddon.ts b/addons/xterm-addon-ligatures/src/LigaturesAddon.ts
index c4586b38..2119662b 100644
--- a/addons/xterm-addon-ligatures/src/LigaturesAddon.ts
+++ b/addons/xterm-addon-ligatures/src/LigaturesAddon.ts
@@ -6,13 +6,14 @@
 import { Terminal } from 'xterm';
 import { enableLigatures } from '.';
 import { ILigatureOptions } from './Types';
+import { LigaturesAddon as ILigaturesApi } from 'xterm-addon-ligatures';
 
 export interface ITerminalAddon {
   activate(terminal: Terminal): void;
   dispose(): void;
 }
 
-export class LigaturesAddon implements ITerminalAddon {
+export class LigaturesAddon implements ITerminalAddon , ILigaturesApi {
   private readonly _fallbackLigatures: string[];
 
   private _terminal: Terminal | undefined;
diff --git a/addons/xterm-addon-ligatures/src/tsconfig.json b/addons/xterm-addon-ligatures/src/tsconfig.json
index 28969f97..f7197160 100644
--- a/addons/xterm-addon-ligatures/src/tsconfig.json
+++ b/addons/xterm-addon-ligatures/src/tsconfig.json
@@ -10,7 +10,10 @@
     "preserveWatchOutput": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "xterm-addon-ligatures" : [ "../typings/xterm-addon-ligatures.d.ts" ]
+    }
   },
   "include": [
     "./**/*",
diff --git a/addons/xterm-addon-search/package.json b/addons/xterm-addon-search/package.json
index f846874d..e0a8dfdc 100644
--- a/addons/xterm-addon-search/package.json
+++ b/addons/xterm-addon-search/package.json
@@ -15,8 +15,7 @@
     "xterm.js"
   ],
   "scripts": {
-    "build": "../../node_modules/.bin/tsc -p .",
-    "prepackage": "npm run build",
+    "prepackage": "../../node_modules/.bin/tsc -p .",
     "package": "../../node_modules/.bin/webpack",
     "prepublishOnly": "npm run package"
   },
diff --git a/addons/xterm-addon-search/src/SearchAddon.ts b/addons/xterm-addon-search/src/SearchAddon.ts
index 959214c9..03f628ee 100644
--- a/addons/xterm-addon-search/src/SearchAddon.ts
+++ b/addons/xterm-addon-search/src/SearchAddon.ts
@@ -6,6 +6,7 @@
 import { Terminal, IDisposable, ITerminalAddon, IDecoration } from 'xterm';
 import { EventEmitter } from 'common/EventEmitter';
 import { Disposable, toDisposable, disposeArray, MutableDisposable } from 'common/Lifecycle';
+import { SearchAddon as ISearchApi } from 'xterm-addon-search';
 
 export interface ISearchOptions {
   regex?: boolean;
@@ -61,7 +62,7 @@ const NON_WORD_CHARACTERS = ' ~!@#$%^&*()+`-=[]{}|\\;:"\',./<>?';
 const LINES_CACHE_TIME_TO_LIVE = 15 * 1000; // 15 secs
 const DEFAULT_HIGHLIGHT_LIMIT = 1000;
 
-export class SearchAddon extends Disposable implements ITerminalAddon {
+export class SearchAddon extends Disposable implements ITerminalAddon , ISearchApi {
   private _terminal: Terminal | undefined;
   private _cachedSearchTerm: string | undefined;
   private _highlightedLines: Set<number> = new Set();
diff --git a/addons/xterm-addon-search/src/tsconfig.json b/addons/xterm-addon-search/src/tsconfig.json
index 1f08b12d..38626d3b 100644
--- a/addons/xterm-addon-search/src/tsconfig.json
+++ b/addons/xterm-addon-search/src/tsconfig.json
@@ -17,6 +17,9 @@
     "paths": {
       "common/*": [
         "../../../src/common/*"
+      ],
+      "xterm-addon-search" : [
+        "../typings/xterm-addon-search.d.ts"
       ]
     }
   },
diff --git a/addons/xterm-addon-unicode11/src/Unicode11Addon.ts b/addons/xterm-addon-unicode11/src/Unicode11Addon.ts
index d4ddf77e..c6e19d88 100644
--- a/addons/xterm-addon-unicode11/src/Unicode11Addon.ts
+++ b/addons/xterm-addon-unicode11/src/Unicode11Addon.ts
@@ -7,9 +7,9 @@
 
 import { Terminal, ITerminalAddon } from 'xterm';
 import { UnicodeV11 } from './UnicodeV11';
+import { Unicode11Addon as IUnicode11Api } from 'xterm-addon-unicode11';
 
-
-export class Unicode11Addon implements ITerminalAddon {
+export class Unicode11Addon implements ITerminalAddon , IUnicode11Api {
   public activate(terminal: Terminal): void {
     terminal.unicode.register(new UnicodeV11());
   }
diff --git a/addons/xterm-addon-unicode11/src/tsconfig.json b/addons/xterm-addon-unicode11/src/tsconfig.json
index e2c1464e..dddfc8c6 100644
--- a/addons/xterm-addon-unicode11/src/tsconfig.json
+++ b/addons/xterm-addon-unicode11/src/tsconfig.json
@@ -15,6 +15,9 @@
     "paths": {
       "common/*": [
         "../../../src/common/*"
+      ],
+      "xterm-addon-unicode11": [
+        "../typings/xterm-addon-unicode11.d.ts"
       ]
     },
     "types": [
diff --git a/addons/xterm-addon-web-links/src/WebLinksAddon.ts b/addons/xterm-addon-web-links/src/WebLinksAddon.ts
index 5c956cec..a4a08726 100644
--- a/addons/xterm-addon-web-links/src/WebLinksAddon.ts
+++ b/addons/xterm-addon-web-links/src/WebLinksAddon.ts
@@ -4,6 +4,7 @@
  */
 
 import { Terminal, ITerminalAddon, IDisposable } from 'xterm';
+import { WebLinksAddon as IWebLinksApi } from 'xterm-addon-web-links';
 import { ILinkProviderOptions, WebLinkProvider } from './WebLinkProvider';
 
 // consider everthing starting with http:// or https://
@@ -34,7 +35,7 @@ function handleLink(event: MouseEvent, uri: string): void {
   }
 }
 
-export class WebLinksAddon implements ITerminalAddon {
+export class WebLinksAddon implements ITerminalAddon , IWebLinksApi {
   private _terminal: Terminal | undefined;
   private _linkProvider: IDisposable | undefined;
 
diff --git a/addons/xterm-addon-web-links/src/tsconfig.json b/addons/xterm-addon-web-links/src/tsconfig.json
index 7e68574d..0c30d60c 100644
--- a/addons/xterm-addon-web-links/src/tsconfig.json
+++ b/addons/xterm-addon-web-links/src/tsconfig.json
@@ -13,7 +13,12 @@
     "strict": true,
     "types": [
       "../../../node_modules/@types/mocha"
-    ]
+    ],
+    "paths": {
+      "xterm-addon-web-links": [
+        "../typings/xterm-addon-web-links.d.ts"
+      ]
+    }
   },
   "include": [
     "./**/*",
diff --git a/addons/xterm-addon-webgl/src/WebglAddon.ts b/addons/xterm-addon-webgl/src/WebglAddon.ts
index 3e091f0b..26803ef9 100644
--- a/addons/xterm-addon-webgl/src/WebglAddon.ts
+++ b/addons/xterm-addon-webgl/src/WebglAddon.ts
@@ -10,10 +10,11 @@ import { Disposable, toDisposable } from 'common/Lifecycle';
 import { getSafariVersion, isSafari } from 'common/Platform';
 import { ICoreService, IDecorationService, ILogService, IOptionsService } from 'common/services/Services';
 import { ITerminalAddon, Terminal } from 'xterm';
+import { WebglAddon as IWebglApi } from 'xterm-addon-webgl';
 import { WebglRenderer } from './WebglRenderer';
 import { setTraceLogger } from 'common/services/LogService';
 
-export class WebglAddon extends Disposable implements ITerminalAddon {
+export class WebglAddon extends Disposable implements ITerminalAddon , IWebglApi {
   private _terminal?: Terminal;
   private _renderer?: WebglRenderer;
 
diff --git a/addons/xterm-addon-webgl/src/tsconfig.json b/addons/xterm-addon-webgl/src/tsconfig.json
index 4d4194db..347b1741 100644
--- a/addons/xterm-addon-webgl/src/tsconfig.json
+++ b/addons/xterm-addon-webgl/src/tsconfig.json
@@ -17,6 +17,9 @@
       ],
       "browser/*": [
         "../../../src/browser/*"
+      ],
+      "xterm-addon-webgl": [
+        "../typings/xterm-addon-webgl.d.ts"
       ]
     },
     "strict": true,