diff --git a/gulpfile.js b/gulpfile.js
index 995be41063..0b812a2f88 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -76,7 +76,7 @@ gulp.task('createPackage', function (callback) {
         .pipe(jsonTransform(function (data) {
             data.version = editorVersion;
             data.main = paths.mainJSfile.replace(".js", ".min.js");
-            data.dependencies["survey-knockout-bootstrap"] = editorVersion;
+            data.dependencies["survey-knockout"] = editorVersion;
             return data;
         }, "  "))
         .pipe(rename("package.json"))
@@ -86,7 +86,7 @@ gulp.task('createPackage', function (callback) {
 gulp.task('updatesurveyjsversion', function (callback) {
     return gulp.src("package.json")
         .pipe(jsonTransform(function (data) {
-            data.dependencies["survey-knockout-bootstrap"] = "^" + editorVersion;
+            data.dependencies["survey-knockout"] = "^" + editorVersion;
             return data;
         }, "  "))
         .pipe(gulp.dest(""));
diff --git a/package.json b/package.json
index c843c34d67..fb829a37dc 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "karma-qunit": "^1.1.0",
     "qunit": "^0.9.1",
     "rimraf": "^2.5.4",
+    "source-map-loader": "^0.1.5",
     "ts-loader": "^0.9.4",
     "typescript": "^2.0.2",
     "webpack-stream": "^3.2.0"
diff --git a/packagetemplate.json b/packagetemplate.json
index 6ec87c0898..55337f976b 100644
--- a/packagetemplate.json
+++ b/packagetemplate.json
@@ -21,7 +21,7 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
-    "survey-knockout-bootstrap": "^0.9.3",
+    "survey-knockout": "^0.10.0",
     "knockout": "^3.4.0",
     "bootstrap": "^3.3.6",
     "ace-builds": "^1.2.2"
diff --git a/src/dragdrophelper.ts b/src/dragdrophelper.ts
index 9e2a6edbac..b9963db5b8 100644
--- a/src/dragdrophelper.ts
+++ b/src/dragdrophelper.ts
@@ -1,4 +1,4 @@
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class DragDropHelper {
     static dataStart: string = "surveyjs,";
diff --git a/src/editor.ts b/src/editor.ts
index 8fd176e9c0..8e3329e6c2 100644
--- a/src/editor.ts
+++ b/src/editor.ts
@@ -12,7 +12,7 @@ import {SurveyJSON5} from "./json5";
 import {html as templateEditorHtml} from "./templateEditor.ko.html";
 import {html as templatePageHtml} from "./template_page.html";
 import {html as templateQuestionHtml} from "./template_question.html";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyEditor {
     public static updateTextTimeout: number = 1000;
diff --git a/src/objectEditor.ts b/src/objectEditor.ts
index 1797ecc508..645e39a859 100644
--- a/src/objectEditor.ts
+++ b/src/objectEditor.ts
@@ -1,6 +1,6 @@
 import {SurveyObjectProperty} from "./objectProperty";
 import {editorLocalization} from "./editorLocalization";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyObjectEditor {
     private selectedObjectValue: any;
diff --git a/src/objectProperty.ts b/src/objectProperty.ts
index aebe58f4c5..69caf00481 100644
--- a/src/objectProperty.ts
+++ b/src/objectProperty.ts
@@ -1,6 +1,6 @@
 import {SurveyPropertyEditorBase} from "./propertyEditors/propertyEditorBase";
 import {editorLocalization} from "./editorLocalization";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export declare type SurveyOnPropertyChangedCallback = (property: SurveyObjectProperty, newValue: any) => void;
 
diff --git a/src/objectVerbs.ts b/src/objectVerbs.ts
index b8c7b5a161..d67f738b3e 100644
--- a/src/objectVerbs.ts
+++ b/src/objectVerbs.ts
@@ -1,6 +1,6 @@
 import {editorLocalization} from "./editorLocalization";
 import {SurveyHelper, ObjType} from "./surveyHelper";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyVerbs {
     private surveyValue: Survey.Survey;
diff --git a/src/pagesEditor.ts b/src/pagesEditor.ts
index d3be76ffe6..0e4edeb9ff 100644
--- a/src/pagesEditor.ts
+++ b/src/pagesEditor.ts
@@ -1,5 +1,5 @@
 import {SurveyHelper} from "./surveyHelper";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export declare type SurveyAddNewPageCallback = () => void;
 export declare type SurveySelectPageCallback = (page: Survey.Page) => void;
diff --git a/src/propertyEditors/propertyMatrixDropdownColumnsEditor.ts b/src/propertyEditors/propertyMatrixDropdownColumnsEditor.ts
index 78fda883a5..af2aa8125d 100644
--- a/src/propertyEditors/propertyMatrixDropdownColumnsEditor.ts
+++ b/src/propertyEditors/propertyMatrixDropdownColumnsEditor.ts
@@ -1,7 +1,7 @@
 import {SurveyPropertyItemsEditor} from "./propertyItemsEditor";
 import {SurveyPropertyEditorBase} from "./propertyEditorBase";
 import {SurveyPropertyItemValuesEditor} from "./propertyItemValuesEditor";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyPropertyDropdownColumnsEditor extends SurveyPropertyItemsEditor {
     constructor() {
diff --git a/src/propertyEditors/propertyRestfullEditor.ts b/src/propertyEditors/propertyRestfullEditor.ts
index d7f8483b00..c522804cf0 100644
--- a/src/propertyEditors/propertyRestfullEditor.ts
+++ b/src/propertyEditors/propertyRestfullEditor.ts
@@ -1,7 +1,7 @@
 import {SurveyPropertyModalEditor} from "./propertyModalEditor";
 import {SurveyPropertyEditorBase} from "./propertyEditorBase";
 import {editorLocalization} from "../editorLocalization";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyPropertyResultfullEditor extends SurveyPropertyModalEditor {
     koUrl: any; koPath: any; koValueName: any; koTitleName: any;
diff --git a/src/propertyEditors/propertyTextItemsEditor.ts b/src/propertyEditors/propertyTextItemsEditor.ts
index 9c5e6572a0..3f8ca077da 100644
--- a/src/propertyEditors/propertyTextItemsEditor.ts
+++ b/src/propertyEditors/propertyTextItemsEditor.ts
@@ -3,7 +3,7 @@ import {SurveyPropertyEditorBase} from "./propertyEditorBase";
 import {SurveyHelper} from "../surveyHelper";
 import {editorLocalization} from "../editorLocalization";
 import {SurveyPropertyValidatorsEditor} from "./propertyValidatorsEditor";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyPropertyTextItemsEditor extends SurveyPropertyItemsEditor {
     constructor() {
diff --git a/src/propertyEditors/propertyTriggersEditor.ts b/src/propertyEditors/propertyTriggersEditor.ts
index 14b6cd7e4c..51f2969675 100644
--- a/src/propertyEditors/propertyTriggersEditor.ts
+++ b/src/propertyEditors/propertyTriggersEditor.ts
@@ -1,7 +1,7 @@
 import {SurveyPropertyItemsEditor} from "./propertyItemsEditor";
 import {SurveyPropertyEditorBase} from "./propertyEditorBase";
 import {editorLocalization} from "../editorLocalization";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyPropertyTriggersEditor extends SurveyPropertyItemsEditor {
     koQuestions: any; koPages: any;
diff --git a/src/propertyEditors/propertyValidatorsEditor.ts b/src/propertyEditors/propertyValidatorsEditor.ts
index 74cd7d86f3..0d335a97c0 100644
--- a/src/propertyEditors/propertyValidatorsEditor.ts
+++ b/src/propertyEditors/propertyValidatorsEditor.ts
@@ -1,7 +1,7 @@
 import {SurveyPropertyItemsEditor} from "./propertyItemsEditor";
 import {SurveyPropertyEditorBase} from "./propertyEditorBase";
 import {SurveyObjectEditor} from "../objectEditor";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyPropertyValidatorsEditor extends SurveyPropertyItemsEditor {
     private selectedObjectEditor: SurveyObjectEditor;
diff --git a/src/surveyHelper.ts b/src/surveyHelper.ts
index a33100a85e..7b8a8541bf 100644
--- a/src/surveyHelper.ts
+++ b/src/surveyHelper.ts
@@ -1,5 +1,5 @@
 import {editorLocalization} from "./editorLocalization";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export enum ObjType { Unknown, Survey, Page, Question }
 export class SurveyHelper {
diff --git a/src/surveyObjects.ts b/src/surveyObjects.ts
index 1d742d081e..866628c394 100644
--- a/src/surveyObjects.ts
+++ b/src/surveyObjects.ts
@@ -1,5 +1,5 @@
 import {SurveyHelper, ObjType} from "./surveyHelper";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyObjectItem {
     public value: Survey.Base;
diff --git a/src/textWorker.ts b/src/textWorker.ts
index 6fa2c42e4d..4200b08508 100644
--- a/src/textWorker.ts
+++ b/src/textWorker.ts
@@ -1,5 +1,5 @@
 import {SurveyJSON5} from "./json5";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 class TextParserPropery {
     isFound: boolean;
diff --git a/src/undoredo.ts b/src/undoredo.ts
index a40595442f..c31a2a5b26 100644
--- a/src/undoredo.ts
+++ b/src/undoredo.ts
@@ -1,4 +1,4 @@
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class SurveyUndoRedo {
     private items: Array<UndoRedoItem>;
diff --git a/tests/ObjectEditorTestedClasses.ts b/tests/ObjectEditorTestedClasses.ts
index 4715b74c42..7b5d8d70e3 100644
--- a/tests/ObjectEditorTestedClasses.ts
+++ b/tests/ObjectEditorTestedClasses.ts
@@ -1,4 +1,4 @@
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 export class Car {
     public name: string;
diff --git a/tests/SurveyEditorTests.ts b/tests/SurveyEditorTests.ts
index 23c88a3d95..0dbf343e73 100644
--- a/tests/SurveyEditorTests.ts
+++ b/tests/SurveyEditorTests.ts
@@ -1,5 +1,5 @@
 import {SurveyEditor} from "../src/editor";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 QUnit.module("surveyEditorTests");
 
diff --git a/tests/propertyEditorsTests.ts b/tests/propertyEditorsTests.ts
index 22659630c2..623b15878f 100644
--- a/tests/propertyEditorsTests.ts
+++ b/tests/propertyEditorsTests.ts
@@ -4,7 +4,7 @@ import {SurveyPropertyDropdownColumnsEditor} from "../src/propertyEditors/proper
 import {SurveyObjectProperty} from "../src/objectProperty";
 import {SurveyPropertyTextEditor} from "../src/propertyEditors/propertyModalEditor";
 import {SurveyPropertyResultfullEditor} from "../src/propertyEditors/propertyRestfullEditor";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 import "../src/propertyEditors/propertyTextItemsEditor";
 
 QUnit.module("PropertyEditorsTests");
diff --git a/tests/surveyObjectsTests.ts b/tests/surveyObjectsTests.ts
index 6c241d6f57..b129e15c23 100644
--- a/tests/surveyObjectsTests.ts
+++ b/tests/surveyObjectsTests.ts
@@ -8,7 +8,7 @@ import {
     SurveyPropertyValidatorItem
 } from "../src/propertyEditors/propertyValidatorsEditor";
 import {SurveyVerbChangeTypeItem, SurveyVerbChangePageItem} from "../src/objectVerbs";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 QUnit.module("surveyObjects");
 
diff --git a/tests/undoredoTests.ts b/tests/undoredoTests.ts
index 955ffb69b7..c7f48093af 100644
--- a/tests/undoredoTests.ts
+++ b/tests/undoredoTests.ts
@@ -1,6 +1,6 @@
 import {SurveyUndoRedo} from "../src/undoredo";
 import {SurveyEditor} from "../src/editor";
-import * as Survey from "survey-knockout-bootstrap";
+import * as Survey from "survey-knockout";
 
 QUnit.module("UndoRedoTests");
 
diff --git a/typings.json b/typings.json
index 87506b5274..ae17b4bd5e 100644
--- a/typings.json
+++ b/typings.json
@@ -6,6 +6,6 @@
     "qunit": "github:DefinitelyTyped/DefinitelyTyped/qunit/qunit.d.ts#73110d92bdab2367e326f297bef3574285cba329"
   },
   "dependencies": {
-    "survey-knockout-bootstrap": "github:andrewtelnov/surveyjs/lib_typings/entries/ko.d.ts"
+    "survey-knockout": "github:andrewtelnov/surveyjs/lib_typings/entries/ko.d.ts"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
index 116a4802db..dc724c5e2a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -30,11 +30,11 @@ module.exports = function(options) {
                 commonjs: 'knockout',
                 amd: 'knockout'
             },
-            'survey-knockout-bootstrap': {
+            'survey-knockout': {
                 root: 'Survey',
-                commonjs2: 'survey-knockout-bootstrap',
-                commonjs: 'survey-knockout-bootstrap',
-                amd: 'survey-knockout-bootstrap'
+                commonjs2: 'survey-knockout',
+                commonjs: 'survey-knockout',
+                amd: 'survey-knockout'
             }
         },
         module: {