diff --git a/package.json b/package.json
index 6654434006..5314784c33 100644
--- a/package.json
+++ b/package.json
@@ -30,17 +30,17 @@
     "lint": "tslint \"src/**/*.ts\" || true"
   },
   "dependencies": {
-    "@angular/common": "~2.1.2",
-    "@angular/compiler": "~2.1.2",
-    "@angular/compiler-cli": "~2.1.2",
-    "@angular/core": "~2.1.2",
-    "@angular/forms": "~2.1.2",
-    "@angular/http": "~2.1.2",
-    "@angular/platform-browser": "~2.1.2",
-    "@angular/platform-browser-dynamic": "~2.1.2",
-    "@angular/platform-server": "~2.1.2",
-    "@angular/router": "~3.1.2",
-    "@angular/upgrade": "~2.1.2",
+    "@angular/common": "~2.2.4",
+    "@angular/compiler": "~2.2.4",
+    "@angular/compiler-cli": "~2.2.4",
+    "@angular/core": "~2.2.4",
+    "@angular/forms": "~2.2.4",
+    "@angular/http": "~2.2.4",
+    "@angular/platform-browser": "~2.2.4",
+    "@angular/platform-browser-dynamic": "~2.2.4",
+    "@angular/platform-server": "~2.2.4",
+    "@angular/router": "~3.2.4",
+    "@angular/upgrade": "~2.2.4",
     "@angularclass/bootloader": "~1.0.1",
     "@angularclass/idle-preload": "~1.0.4",
     "angular2-express-engine": "~2.1.0-rc.1",
@@ -56,27 +56,27 @@
     "ng2-translate": "~4.0.1",
     "preboot": "~4.5.2",
     "rxjs": "5.0.0-beta.12",
-    "webfontloader": "^1.6.26",
+    "webfontloader": "^1.6.27",
     "zone.js": "~0.6.26"
   },
   "devDependencies": {
-    "@ngtools/webpack": "~1.1.7",
-    "@types/body-parser": "0.0.29",
-    "@types/compression": "0.0.29",
-    "@types/cookie-parser": "^1.3.29",
-    "@types/express": "^4.0.32",
-    "@types/express-serve-static-core": "^4.0.33",
-    "@types/hammerjs": "^2.0.32",
+    "@ngtools/webpack": "1.1.7",
+    "@types/body-parser": "0.0.33",
+    "@types/compression": "0.0.33",
+    "@types/cookie-parser": "^1.3.30",
+    "@types/express": "^4.0.34",
+    "@types/express-serve-static-core": "^4.0.39",
+    "@types/hammerjs": "^2.0.33",
     "@types/memory-cache": "0.0.29",
-    "@types/mime": "0.0.28",
+    "@types/mime": "0.0.29",
     "@types/morgan": "^1.7.32",
-    "@types/node": "^6.0.38",
-    "@types/serve-static": "^1.7.27",
+    "@types/node": "^6.0.51",
+    "@types/serve-static": "^1.7.31",
     "@types/webfontloader": "^1.6.27",
     "accepts": "^1.3.3",
-    "angular2-template-loader": "^0.4.0",
+    "angular2-template-loader": "^0.6.0",
     "awesome-typescript-loader": "^2.2.4",
-    "codelyzer": "1.0.0-beta.3",
+    "codelyzer": "2.0.0-beta.1",
     "cookie-parser": "^1.4.3",
     "copy-webpack-plugin": "~4.0.1",
     "express-interceptor": "^1.2.0",
@@ -85,21 +85,22 @@
     "json-loader": "^0.5.4",
     "memory-cache": "^0.1.6",
     "node-sass": "^3.13.0",
-    "nodemon": "^1.10.0",
+    "nodemon": "^1.11.0",
     "raw-loader": "^0.5.1",
     "reflect-metadata": "0.1.8",
     "rimraf": "^2.5.4",
     "sass-loader": "^4.0.2",
     "string-replace-loader": "^1.0.5",
     "ts-helpers": "^1.1.2",
-    "ts-node": "^1.3.0",
-    "tslint": "3.13.0",
-    "typescript": "2.0.2",
+    "ts-node": "^1.7.0",
+    "tslint": "4.0.2",
+    "tslint-loader": "3.2.1",
+    "typescript": "2.0.10",
     "v8-lazy-parse-webpack-plugin": "^0.3.0",
     "webpack": "2.1.0-beta.27",
     "webpack-bundle-analyzer": "1.4.1",
     "webpack-dev-middleware": "^1.8.4",
     "webpack-dev-server": "2.1.0-beta.11",
-    "webpack-merge": "~0.16.0"
+    "webpack-merge": "~1.0.2"
   }
 }
diff --git a/tslint.json b/tslint.json
index 0ca77a12c6..c84aa07ebb 100644
--- a/tslint.json
+++ b/tslint.json
@@ -2,102 +2,19 @@
   "rulesDirectory": [
     "node_modules/codelyzer"
   ],
-  "rules":{
-    "class-name": true,
-    "comment-format": [
+  "rules": {
+    "directive-selector": [
       true,
-      "check-space"
+      "attribute",
+      "dspace",
+      "camelCase"
     ],
-    "curly": true,
-    "eofline": true,
-    "forin": true,
-    "indent": [
+    "component-selector": [
       true,
-      "spaces"
+      "element",
+      "dspace",
+      "kebab-case"
     ],
-    "label-position": true,
-    "label-undefined": true,
-    "max-line-length": [
-      true,
-      140
-    ],
-    "member-access": false,
-    "member-ordering": [
-      true,
-      "static-before-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-bitwise": true,
-    "no-console": [
-      true,
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
-    "no-construct": true,
-    "no-debugger": true,
-    "no-duplicate-key": true,
-    "no-duplicate-variable": true,
-    "no-empty": false,
-    "no-eval": true,
-    "no-inferrable-types": true,
-    "no-shadowed-variable": true,
-    "no-string-literal": false,
-    "no-switch-case-fall-through": true,
-    "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "no-unused-variable": true,
-    "no-unreachable": true,
-    "no-use-before-declare": true,
-    "no-var-keyword": true,
-    "object-literal-sort-keys": false,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "radix": true,
-    "semicolon": [
-      "always"
-    ],
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ],
-    "directive-selector-prefix": [true, "ds"],
-    "component-selector-prefix": [true, "ds"],
-    "directive-selector-name": [true, "camelCase"],
-    "component-selector-name": [true, "kebab-case"],
-    "directive-selector-type": [true, "attribute"],
-    "component-selector-type": [true, "element"],
     "use-input-property-decorator": true,
     "use-output-property-decorator": true,
     "use-host-property-decorator": true,
@@ -107,7 +24,11 @@
     "no-forward-ref": true,
     "use-life-cycle-interface": true,
     "use-pipe-transform-interface": true,
-    "pipe-naming": [true, "camelCase", "ds"],
+    "pipe-naming": [
+      true,
+      "camelCase",
+      "dspace"
+    ],
     "component-class-suffix": true,
     "directive-class-suffix": true,
     "import-destructuring-spacing": true,
diff --git a/webpack.config.ts b/webpack.config.ts
index 0ce1116f2e..63fae60aa4 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -21,7 +21,12 @@ export var commonPlugins = [
 
   // Loader options
   new webpack.LoaderOptionsPlugin({
-
+    options: {
+      tslint: {
+        emitErrors: false,
+        failOnHint: false
+      },
+    }
   }),
 
 ];
@@ -44,7 +49,13 @@ export var commonConfig = {
       { test: /\.html$/, use: 'raw-loader' },
       { test: /\.css$/, use: 'raw-loader' },
       { test: /\.scss$/, use: ['raw-loader', 'sass-loader'] },
-      { test: /\.json$/, use: 'json-loader' }
+      { test: /\.json$/, use: 'json-loader' },
+      {
+        enforce: 'pre',
+        test: /\.ts?$/,
+        use: 'tslint-loader',
+        exclude: /(node_modules)/,
+      }
     ],
   },
   plugins: [