diff --git a/docs/tag-defs/index.js b/docs/tag-defs/index.js
index 4b19bdcbf0..e9f9284bbf 100644
--- a/docs/tag-defs/index.js
+++ b/docs/tag-defs/index.js
@@ -1,18 +1,10 @@
 module.exports = [
   {
-    name: 'controller',
+    name: 'delegate',
     transformFn: function(doc, tag) {
-      var desc = tag.description.trim();
-      var id = desc.split(' ')[0];
-      var other = desc.split(' ').splice(1).join(' ');
-
-      var link = '{@link ionic.controller:' + id + '}';
-      return link + (other ? ' ' + other : '');
+      return '{@link ' + tag.description + '}';
     }
   },
-  {
-    name: 'controllerBind',
-  },
   {
     name: 'parent',
     transformFn: function(doc, tag) {
diff --git a/docs/templates/api/api.template.html b/docs/templates/api/api.template.html
index 7923365421..9a175a4135 100644
--- a/docs/templates/api/api.template.html
+++ b/docs/templates/api/api.template.html
@@ -27,10 +27,10 @@ docType: "<$ doc.docType $>"
   Child of <$ doc.parentLinks $>
 </small>
 <@ endif @>
-<@ if doc.controller @>
+<@ if doc.delegate @>
 <br/>
 <small>
-  Controller: <$ doc.controller $>
+  Delegate: <$ doc.delegate $>
 </small>
 <@ endif @>
 </h1>
diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js
index c230284545..baa660cd73 100644
--- a/js/ext/angular/src/directive/ionicContent.js
+++ b/js/ext/angular/src/directive/ionicContent.js
@@ -28,11 +28,12 @@ angular.module('ionic.ui.content', ['ionic.ui.scroll'])
  * @ngdoc directive
  * @name ionContent
  * @module ionic
+ * @delegate ionic.service:$ionicScrollDelegate
  * @restrict E
  *
  * @description
  * The ionContent directive provides an easy to use content area that can be configured
- * to use Ionic's custom Scroll View, or the built in overflow scorlling of the browser.
+ * to use Ionic's custom Scroll View, or the built in overflow scrolling of the browser.
  *
  * While we recommend using the custom Scroll features in Ionic in most cases, sometimes
  * (for performance reasons) only the browser's native overflow scrolling will suffice,
diff --git a/js/ext/angular/src/directive/ionicNavBar.js b/js/ext/angular/src/directive/ionicNavBar.js
index f0d497be34..0a0b30a1f5 100644
--- a/js/ext/angular/src/directive/ionicNavBar.js
+++ b/js/ext/angular/src/directive/ionicNavBar.js
@@ -226,7 +226,7 @@ function($scope, $element, $attrs, $ionicViewService, $animate, $compile, $ionic
  * @ngdoc directive
  * @name ionNavBar
  * @module ionic
- * @controller $ionicNavBarDelegate as $scope.$$ionicNavBarDelegateController
+ * @delegate ionic.service:$ionicNavBarDelegate
  * @restrict E
  *
  * @description
diff --git a/js/ext/angular/src/directive/ionicScroll.js b/js/ext/angular/src/directive/ionicScroll.js
index c160336b48..bd3dbfb3b6 100644
--- a/js/ext/angular/src/directive/ionicScroll.js
+++ b/js/ext/angular/src/directive/ionicScroll.js
@@ -7,6 +7,7 @@ angular.module('ionic.ui.scroll', [])
  * @ngdoc directive
  * @name ionScroll
  * @module ionic
+ * @delegate ionic.service:$ionicScrollDelegate
  * @restrict E
  *
  * @description
diff --git a/js/ext/angular/src/directive/ionicSideMenu.js b/js/ext/angular/src/directive/ionicSideMenu.js
index c29f0890cb..d03a5fa093 100644
--- a/js/ext/angular/src/directive/ionicSideMenu.js
+++ b/js/ext/angular/src/directive/ionicSideMenu.js
@@ -110,6 +110,7 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
  * @ngdoc directive
  * @name ionSideMenus
  * @module ionic
+ * @delegate ionic.service:$ionicSideMenuDelegate
  * @restrict E
  *
  * @description
@@ -125,14 +126,14 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
  *
  * @usage
  * To use side menus, add an `<ion-side-menus>` parent element,
- * an `<ion-pane ion-side-menu-content>` for the center content,
+ * an `<ion-side-menu-content>` for the center content,
  * and one or more `<ion-side-menu>` directives.
  *
  * ```html
  * <ion-side-menus>
  *   <!-- Center content -->
- *   <ion-pane ion-side-menu-content ng-controller="ContentController">
- *   </ion-pane>
+ *   <ion-side-menu-content ng-controller="ContentController">
+ *   </io-side-menu-content>
  *
  *   <!-- Left menu -->
  *   <ion-side-menu side="left">
@@ -193,20 +194,18 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
  * @ngdoc directive
  * @name ionSideMenuContent
  * @module ionic
- * @restrict A
+ * @restrict E
  * @parent ionic.directive:ionSideMenus
  *
  * @description
  * A container for the main visible content, sibling to one or more
  * {@link ionic.directive:ionSideMenu} directives.
  *
- * An attribute directive, recommended to be used as part of an `<ion-pane>` element.
- *
  * @usage
  * ```html
- * <div ion-side-menu-content
+ * <ion-side-menu-content
  *   drag-content="canDrag">
- * </div>
+ * </ion-side-menu-content>
  * ```
  * For a complete side menu example, see the
  * {@link ionic.directive:ionSideMenus} documentation.
@@ -216,14 +215,14 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture', 'ionic.service.vie
  */
 .directive('ionSideMenuContent', ['$timeout', '$ionicGesture', function($timeout, $ionicGesture) {
   return {
-    restrict: 'AC',
+    restrict: 'EA', //DEPRECATED 'A'
     require: '^ionSideMenus',
     scope: true,
     compile: function(element, attr) {
       return { pre: prelink };
       function prelink($scope, $element, $attr, sideMenuCtrl) {
 
-        $element.addClass('menu-content');
+        $element.addClass('menu-content pane');
 
         if (angular.isDefined(attr.dragContent)) {
           $scope.$watch(attr.dragContent, function(value) {
diff --git a/js/ext/angular/src/directive/ionicSlideBox.js b/js/ext/angular/src/directive/ionicSlideBox.js
index f7c9fdf7c7..62726ec711 100644
--- a/js/ext/angular/src/directive/ionicSlideBox.js
+++ b/js/ext/angular/src/directive/ionicSlideBox.js
@@ -107,6 +107,7 @@ angular.module('ionic.ui.slideBox', [])
  * @ngdoc directive
  * @name ionSlideBox
  * @module ionic
+ * @delegate ionic.service:$ionicSlideBoxDelegate
  * @restrict E
  * @description
  * The Slide Box is a multi-page container where each page can be swiped or dragged between:
diff --git a/js/ext/angular/src/directive/ionicTabBar.js b/js/ext/angular/src/directive/ionicTabBar.js
index fbcc318c4e..59f6645591 100644
--- a/js/ext/angular/src/directive/ionicTabBar.js
+++ b/js/ext/angular/src/directive/ionicTabBar.js
@@ -169,6 +169,7 @@ angular.module('ionic.ui.tabs', ['ionic.service.view'])
  * @ngdoc directive
  * @name ionTabs
  * @module ionic
+ * @delegate ionic.service:$ionicTabsDelegate
  * @restrict E
  * @codepen KbrzJ
  *