diff --git a/Dockerfile b/Dockerfile
index 5a67d9a2..12118ccc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ RUN git clone https://github.com/akveo/ng2-admin.git /var/www \
     && cd /var/www \
     && npm install --global rimraf \
     && npm run clean \
-    && npm install --global typings webpack webpack-dev-server typescript \
+    && npm install --global webpack webpack-dev-server typescript@beta \
     && npm install \
     && npm run prebuild:prod && npm run build:prod
 
diff --git a/docs/contents/articles/012-project-structure/index.md b/docs/contents/articles/012-project-structure/index.md
index 2b89cbfa..d774c6a4 100644
--- a/docs/contents/articles/012-project-structure/index.md
+++ b/docs/contents/articles/012-project-structure/index.md
@@ -53,7 +53,6 @@ ng2-admin/
    ├──tslint.json                * typescript lint config
    ├──typedoc.json               * typescript documentation generator
    ├──tsconfig.json              * config that webpack uses for typescript
-   ├──typings.json               * our typings manager
    └──package.json               * what npm uses to manage it's dependencies
 ```
 In our template we tried to separate theme layer and presentation layer. We believe most of other templates have them combined. That's why when you start developing using them, it gets very hard for you to remove things you don't need.
diff --git a/src/main.browser.ts b/src/main.browser.ts
index 7ac3b9e8..f1de52a0 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -38,7 +38,7 @@ export function main(initialHmrState?: any): Promise<any> {
  * Vendors
  * For vendors for example jQuery, Lodash, angular2-jwt just import them anywhere in your app
  * You can also import them in vendors to ensure that they are bundled in one file
- * Also see custom-typings.d.ts as you also need to do `typings install x` where `x` is your module
+ * Also see custom-typings.d.ts as you also need to do `npm install @types/x` where `x` is your module
  */
 
 
diff --git a/src/vendor.browser.ts b/src/vendor.browser.ts
index e89dc2a1..379786f2 100644
--- a/src/vendor.browser.ts
+++ b/src/vendor.browser.ts
@@ -1,7 +1,7 @@
 // For vendors for example jQuery, Lodash, angular2-jwt just import them here unless you plan on
 // chunking vendors files for async loading. You would need to import the async loaded vendors
 // at the entry point of the async loaded file. Also see custom-typings.d.ts as you also need to
-// run `typings install x` where `x` is your module
+// run `npm install @types/x` where `x` is your module
 
 // Angular 2
 import '@angular/platform-browser';