diff --git a/ng2-components/ng2-alfresco-search/demo/package.json b/ng2-components/ng2-alfresco-search/demo/package.json
index 43f48de7a1..e46a1e6668 100644
--- a/ng2-components/ng2-alfresco-search/demo/package.json
+++ b/ng2-components/ng2-alfresco-search/demo/package.json
@@ -45,25 +45,24 @@
     "alfresco"
   ],
   "dependencies": {
-    "@angular/common": "2.0.0-rc.3",
-    "@angular/compiler": "2.0.0-rc.3",
-    "@angular/core": "2.0.0-rc.3",
-    "@angular/forms": "0.1.1",
-    "@angular/http": "2.0.0-rc.3",
-    "@angular/platform-browser": "2.0.0-rc.3",
-    "@angular/platform-browser-dynamic": "2.0.0-rc.3",
-    "@angular/router": "3.0.0-alpha.7",
-    "@angular/router-deprecated": "2.0.0-rc.2",
-    "@angular/upgrade": "2.0.0-rc.3",
+    "@angular/common": "2.0.0",
+    "@angular/compiler": "2.0.0",
+    "@angular/core": "2.0.0",
+    "@angular/forms": "2.0.0",
+    "@angular/http": "2.0.0",
+    "@angular/platform-browser": "2.0.0",
+    "@angular/platform-browser-dynamic": "2.0.0",
+    "@angular/router": "3.0.0",
+    "@angular/upgrade": "2.0.0",
+    "core-js": "^2.4.1",
+    "reflect-metadata": "^0.1.3",
+    "rxjs": "5.0.0-beta.12",
     "systemjs": "0.19.27",
-    "core-js": "2.4.0",
-    "reflect-metadata": "0.1.3",
-    "rxjs": "5.0.0-beta.6",
-    "zone.js": "0.6.12",
+    "zone.js": "^0.6.23",
 
-    "ng2-translate": "2.2.2",
+    "ng2-translate": "2.5.0",
     "material-design-icons": "2.2.3",
-    "material-design-lite": "1.1.3",
+    "material-design-lite": "1.2.1",
 
     "alfresco-js-api": "^0.3.0",
     "ng2-alfresco-core": "^0.3.0",
diff --git a/ng2-components/ng2-alfresco-search/demo/src/main.ts b/ng2-components/ng2-alfresco-search/demo/src/main.ts
index 50d2503b20..631bc6d216 100644
--- a/ng2-components/ng2-alfresco-search/demo/src/main.ts
+++ b/ng2-components/ng2-alfresco-search/demo/src/main.ts
@@ -15,19 +15,19 @@
  * limitations under the License.
  */
 
-import { Component, OnInit } from '@angular/core';
-import { bootstrap } from '@angular/platform-browser-dynamic';
-import { HTTP_PROVIDERS } from '@angular/http';
+import { NgModule, Component, OnInit } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+
+import { CoreModule } from 'ng2-alfresco-core';
+import { SearchModule } from 'ng2-alfresco-search';
+
 import {
-    ALFRESCO_CORE_PROVIDERS,
     AlfrescoSettingsService,
     AlfrescoAuthenticationService,
     AlfrescoTranslationService
 } from 'ng2-alfresco-core';
-import {
-    ALFRESCO_SEARCH_PROVIDERS,
-    ALFRESCO_SEARCH_DIRECTIVES
-} from 'ng2-alfresco-search';
+
 
 @Component({
     selector: 'alfresco-search-demo',
@@ -46,9 +46,7 @@ import {
                     <alfresco-search [searchTerm]="searchTerm"></alfresco-search>
                 </div>
     `,
-    styles: [':host > .container {padding: 10px}'],
-    providers: [ALFRESCO_SEARCH_PROVIDERS],
-    directives: [ALFRESCO_SEARCH_DIRECTIVES]
+    styles: [':host > .container {padding: 10px}']
 })
 class SearchDemo implements OnInit {
 
@@ -98,8 +96,15 @@ class SearchDemo implements OnInit {
     }
 }
 
-bootstrap(SearchDemo, [
-    HTTP_PROVIDERS,
-    ALFRESCO_CORE_PROVIDERS,
-    ALFRESCO_SEARCH_PROVIDERS
-]);
+@NgModule({
+    imports: [
+        BrowserModule,
+        CoreModule.forRoot(),
+        SearchModule
+    ],
+    declarations: [ SearchDemo ],
+    bootstrap:    [ SearchDemo ]
+})
+export class AppModule { }
+
+platformBrowserDynamic().bootstrapModule(AppModule);
diff --git a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
index 95fa2ddd61..a25396af08 100644
--- a/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
+++ b/ng2-components/ng2-alfresco-search/demo/systemjs.config.js
@@ -2,54 +2,66 @@
  * System configuration for Angular 2 samples
  * Adjust as necessary for your application needs.
  */
-(function(global) {
-    // map tells the System loader where to look for things
-    var map = {
-        'app':                        'dist', // 'dist',
-        '@angular':                   'node_modules/@angular',
-        'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
-        'rxjs':                       'node_modules/rxjs',
+(function (global) {
+    System.config({
+        paths: {
+            // paths serve as alias
+            'npm:': 'node_modules/'
+        },
+        // map tells the System loader where to look for things
+        map: {
+            // our app is within the app folder
+            app: 'dist',
+            // angular bundles
+            '@angular/core': 'npm:@angular/core/bundles/core.umd.js',
+            '@angular/common': 'npm:@angular/common/bundles/common.umd.js',
+            '@angular/compiler': 'npm:@angular/compiler/bundles/compiler.umd.js',
+            '@angular/platform-browser': 'npm:@angular/platform-browser/bundles/platform-browser.umd.js',
+            '@angular/platform-browser-dynamic': 'npm:@angular/platform-browser-dynamic/bundles/platform-browser-dynamic.umd.js',
+            '@angular/http': 'npm:@angular/http/bundles/http.umd.js',
+            '@angular/router': 'npm:@angular/router/bundles/router.umd.js',
+            '@angular/forms': 'npm:@angular/forms/bundles/forms.umd.js',
+            // other libraries
+            'rxjs': 'npm:rxjs',
+            'ng2-translate': 'npm:ng2-translate',
+            'ng2-alfresco-core': 'npm:ng2-alfresco-core/dist',
+            'ng2-alfresco-datatable': 'npm:ng2-alfresco-datatable/dist',
+            'ng2-alfresco-documentlist': 'npm:ng2-alfresco-documentlist/dist',
+            'ng2-alfresco-login': 'npm:ng2-alfresco-login/dist',
+            'ng2-alfresco-search': 'npm:ng2-alfresco-search/dist',
+            'ng2-alfresco-upload': 'npm:ng2-alfresco-upload/dist',
+            'ng2-activiti-form': 'npm:ng2-activiti-form/dist',
+            'ng2-alfresco-viewer': 'npm:ng2-alfresco-viewer/dist',
+            'ng2-alfresco-webscript': 'npm:ng2-alfresco-webscript/dist',
+            'ng2-alfresco-tag': 'npm:ng2-alfresco-tag/dist',
+            'ng2-activiti-tasklist': 'npm:ng2-activiti-tasklist/dist',
+            'alfresco-js-api': 'npm:alfresco-js-api/dist',
+            'ng2-activiti-processlist': 'npm:ng2-activiti-processlist/dist'
+        },
+        // packages tells the System loader how to load when no filename and/or no extension
+        packages: {
+            app: {
+                main: './main.js',
+                defaultExtension: 'js'
+            },
+            rxjs: {
+                defaultExtension: 'js'
+            },
+            'ng2-translate': { defaultExtension: 'js' },
 
-        'ng2-translate': 'node_modules/ng2-translate',
-        'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
-        'ng2-alfresco-search': 'node_modules/ng2-alfresco-search/dist'
-    };
-    // packages tells the System loader how to load when no filename and/or no extension
-    var packages = {
-        'app':                        { main: 'main.js',  defaultExtension: 'js' },
-        'rxjs':                       { defaultExtension: 'js' },
-        'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
-
-        'ng2-translate': { defaultExtension: 'js' },
-        'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
-        'ng2-alfresco-search': { main: 'index.js', defaultExtension: 'js' }
-    };
-    var ngPackageNames = [
-        'common',
-        'compiler',
-        'core',
-        'http',
-        'platform-browser',
-        'platform-browser-dynamic',
-        'router',
-        'router-deprecated',
-        'upgrade'
-    ];
-    // Individual files (~300 requests):
-    function packIndex(pkgName) {
-        packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' };
-    }
-    // Bundled (~40 requests):
-    function packUmd(pkgName) {
-        packages['@angular/'+pkgName] = { main: '/bundles/'+ pkgName + '.umd.js', defaultExtension: 'js' };
-    }
-    // Most environments should use UMD; some (Karma) need the individual index files
-    var setPackageConfig = System.packageWithIndex ? packIndex : packUmd;
-    // Add package entries for angular packages
-    ngPackageNames.forEach(setPackageConfig);
-    var config = {
-        map: map,
-        packages: packages
-    };
-    System.config(config);
+            'ng2-alfresco-core': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-datatable': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-documentlist': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-login': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-search': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-upload': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-viewer': { main: './index.js', defaultExtension: 'js'},
+            'ng2-activiti-form': { main: './index.js', defaultExtension: 'js'},
+            'ng2-activiti-processlist': { main: './index.js', defaultExtension: 'js'},
+            'ng2-activiti-tasklist': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-webscript': { main: './index.js', defaultExtension: 'js'},
+            'ng2-alfresco-tag': { main: './index.js', defaultExtension: 'js'},
+            'alfresco-js-api': { main: './alfresco-js-api.js', defaultExtension: 'js'}
+        }
+    });
 })(this);