diff --git a/bower.json b/bower.json
index dc7bc97023..1ebf5953a5 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
     "moment-duration-format": "^1.3.0",
     "requirejs": "~2.1.22",
     "text": "requirejs-text#^2.0.14",
-    "es6-promise": "^3.0.2",
+    "es6-promise": "^3.3.0",
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",
diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md
index 308ca6d2c1..1d8a422299 100644
--- a/docs/src/guide/index.md
+++ b/docs/src/guide/index.md
@@ -933,7 +933,7 @@ Note that `templateUrl` is not supported for `containers`.
 
 Controls provide options for the `mct-control` directive. 
  
-Six standard control types are included in the forms bundle:
+Ten standard control types are included in the forms bundle:
 
 * `textfield`: An area to enter plain text.
 * `select`: A drop-down list of options.
@@ -941,7 +941,13 @@ Six standard control types are included in the forms bundle:
 * `color`: A color picker.
 * `button`: A button.
 * `datetime`: An input for UTC date/time entry; gives result as a UNIX 
-timestamp, in milliseconds since start of 1970, UTC. 
+timestamp, in milliseconds since start of 1970, UTC.
+* `composite`: A control parenting an array of other controls.
+* `menu-button`: A drop-down list of items supporting custom behavior
+on click.
+* `dialog-button`: A button which opens a dialog allowing a single property
+to be edited.
+* `radio`: A radio button.
 
 New controls may be added as extensions of the controls category. Extensions of 
 this category have two properties: 
diff --git a/main.js b/main.js
index 4d9402d4bf..c7f5ae1e44 100644
--- a/main.js
+++ b/main.js
@@ -27,8 +27,8 @@ requirejs.config({
         "angular": "bower_components/angular/angular.min",
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
         "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "jsPDF": "bower_components/jspdf/dist/jspdf.min",
         "moment": "bower_components/moment/moment",
diff --git a/test-main.js b/test-main.js
index ebc91ed05e..fbfaff4e63 100644
--- a/test-main.js
+++ b/test-main.js
@@ -53,8 +53,8 @@ requirejs.config({
         "angular": "bower_components/angular/angular.min",
         "angular-route": "bower_components/angular-route/angular-route.min",
         "csv": "bower_components/comma-separated-values/csv.min",
-        "es6-promise": "bower_components/es6-promise/promise.min",
         "EventEmitter": "bower_components/eventemitter3/index",
+        "es6-promise": "bower_components/es6-promise/es6-promise.min",
         "html2canvas": "bower_components/html2canvas/build/html2canvas.min",
         "jsPDF": "bower_components/jspdf/dist/jspdf.min",
         "moment": "bower_components/moment/moment",