diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/autoscale.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/autoscale.directive.js
index 11fff9639f..f9ca4350e2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/autoscale.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/autoscale.directive.js
@@ -1,20 +1,22 @@
 /**
- * @ngdoc directive
- * @name umbraco.directives.directive:autoScale
- * @element div
- * @function
- *
- * @description
- * Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
- * So if you only want to scale the div to 70 pixels from the bottom you pass "70"
- *
- * @example
-   <example module="umbraco.directives">
-     <file name="index.html">
-         <div auto-scale="70" class="input-block-level"></div>
-     </file>
-   </example>
- */
+* @ngdoc directive
+* @name umbraco.directives.directive:autoScale
+* @element div
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+* @function
+* @description
+* Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
+* So if you only want to scale the div to 70 pixels from the bottom you pass "70"
+
+* @example
+* <example module="umbraco.directives">
+*    <file name="index.html">
+*        <div auto-scale="70" class="input-block-level"></div>
+*    </file>
+* </example>
+**/
+
 angular.module("umbraco.directives")
   .directive('autoScale', function ($window) {
     return function (scope, el, attrs) {
@@ -35,4 +37,4 @@ angular.module("umbraco.directives")
       });
 
     };
-  });
\ No newline at end of file
+  });
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/detectfold.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/detectfold.directive.js
index f890ee4989..ac2b86582e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/detectfold.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/detectfold.directive.js
@@ -1,9 +1,12 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbPanel
+* @name umbraco.directives.directive:detectFold
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @description This is used for the editor buttons to ensure they are displayed correctly if the horizontal overflow of the editor
- * exceeds the height of the window
+* exceeds the height of the window
 **/
+
 angular.module("umbraco.directives.html")
 	.directive('detectFold', function ($timeout, $log, windowResizeListener) {
 	    return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbItemSorter.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbItemSorter.directive.js
index 2be9e08376..056bb9559c 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbItemSorter.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbItemSorter.directive.js
@@ -1,11 +1,14 @@
-/**
+/**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbItemSorter
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @function
 * @element ANY
 * @restrict E
 * @description A re-usable directive for sorting items
 **/
+
 function umbItemSorter(angularHelper) {
     return {
         scope: {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbcontentname.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbcontentname.directive.js
index a99e3bd378..ec1d260d10 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbcontentname.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbcontentname.directive.js
@@ -1,11 +1,14 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbContentName
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @restrict E
 * @function
 * @description
 * Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
+
 angular.module("umbraco.directives")
 	.directive('umbContentName', function ($timeout, localizationService) {
 	    return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbheader.directive.js
index 5056d298dd..ccf37b14a2 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbheader.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbheader.directive.js
@@ -1,11 +1,14 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbHeader
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @restrict E
 * @function
 * @description
 * The header on an editor that contains tabs using bootstrap tabs - THIS IS OBSOLETE, use umbTabHeader instead
 **/
+
 angular.module("umbraco.directives")
 .directive('umbHeader', function ($parse, $timeout) {
     return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umblogin.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umblogin.directive.js
index fbea4cd60d..a4dbd5fd13 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umblogin.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umblogin.directive.js
@@ -1,10 +1,13 @@
-/**
+/**
 * @ngdoc directive
-* @name umbraco.directives.directive:login
+* @name umbraco.directives.directive:umbLogin
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @function
 * @element ANY
 * @restrict E
 **/
+
 function loginDirective() {
     return {
         restrict: "E",    // restrict to an element
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umboptionsmenu.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umboptionsmenu.directive.js
index 4f5f241537..d51fe73448 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umboptionsmenu.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umboptionsmenu.directive.js
@@ -1,3 +1,13 @@
+/**
+* @ngdoc directive
+* @name umbraco.directives.directive:umbOptionsMenu
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+* @function
+* @element ANY
+* @restrict E
+**/
+
 angular.module("umbraco.directives")
 .directive('umbOptionsMenu', function ($injector, treeService, navigationService, umbModelMapper, appState) {
     return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbphotofolder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbphotofolder.directive.js
index c60e682ee1..1c907dae9e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbphotofolder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbphotofolder.directive.js
@@ -1,8 +1,11 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbPhotoFolder
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
 * @restrict E
 **/
+
 angular.module("umbraco.directives.html")
     .directive('umbPhotoFolder', function($compile, $log, $timeout, $filter, umbPhotoFolderHelper) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbsort.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbsort.directive.js
index 6166637eed..aab837f916 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbsort.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbsort.directive.js
@@ -1,20 +1,24 @@
 /**
- * @ngdoc directive
- * @name umbraco.directives.directive:umbSort
- * @element div
- * @function
- *
- * @description
- * Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
- * So if you only want to scale the div to 70 pixels from the bottom you pass "70"
- *
- * @example
-   <example module="umbraco.directives">
-     <file name="index.html">
-         <div umb-sort="70" class="input-block-level"></div>
-     </file>
-   </example>
- */
+* @ngdoc directive
+* @name umbraco.directives.directive:umbSort
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+*
+* @element div
+* @function
+*
+* @description
+* Resize div's automatically to fit to the bottom of the screen, as an optional parameter an y-axis offset can be set
+* So if you only want to scale the div to 70 pixels from the bottom you pass "70"
+*
+* @example
+* <example module="umbraco.directives">
+*     <file name="index.html">
+*         <div umb-sort="70" class="input-block-level"></div>
+*     </file>
+* </example>
+**/
+
 angular.module("umbraco.directives")
   .value('umbSortContextInternal',{})
   .directive('umbSort', function($log,umbSortContextInternal) {
@@ -165,4 +169,4 @@ angular.module("umbraco.directives")
              }
           };
 
-        });
\ No newline at end of file
+        });
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbtabview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbtabview.directive.js
index 75d1c91681..5fe813509e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbtabview.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbtabview.directive.js
@@ -1,8 +1,12 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbTabView
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+*
 * @restrict E
 **/
+
 angular.module("umbraco.directives")
 .directive('umbTabView', function($timeout, $log){
 	return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbuploaddropzone.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbuploaddropzone.directive.js
index 4c53732805..64ca76a6ec 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbuploaddropzone.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/_obsolete/umbuploaddropzone.directive.js
@@ -1,8 +1,12 @@
 /**
 * @ngdoc directive
 * @name umbraco.directives.directive:umbUploadDropzone
+* @deprecated
+* We plan to remove this directive in the next major version of umbraco (8.0). The directive is not recommended to use.
+*
 * @restrict E
 **/
+
 angular.module("umbraco.directives.html")
 	.directive('umbUploadDropzone', function(){
 		return {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
index 882e273002..7daa1a3243 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
@@ -1,7 +1,13 @@
 /**
+<<<<<<< HEAD
  * @ngdoc directive
  * @name umbraco.directives.directive:headline
  **/
+=======
+* @ngdoc directive
+* @name umbraco.directives.directive:hotkey
+**/
+>>>>>>> fix broken directives overview + set marker on deprecated directives
 angular.module("umbraco.directives")
     .directive('hotkey', function($window, keyboardService, $log) {
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
index 5da3b1c2a9..70baa6718b 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbcontrolgroup.directive.js
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbProperty
+* @name umbraco.directives.directive:umbControlGroup
 * @restrict E
 **/
 angular.module("umbraco.directives.html")
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js
index 865d5f9c0c..8c01fb4d4e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbpane.directive.js
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbProperty
+* @name umbraco.directives.directive:umbPane
 * @restrict E
 **/
 angular.module("umbraco.directives.html")
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
index 4434407d54..2a183564f6 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
@@ -1,10 +1,9 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbCropsy
+* @name umbraco.directives.directive:umbImageGravity
 * @restrict E
 * @function
 * @description
-* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
 angular.module("umbraco.directives")
 	.directive('umbImageGravity', function ($timeout, localizationService, $log) {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js
index c1892b6c05..dd6dcffc31 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagethumbnail.directive.js
@@ -1,10 +1,9 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbCropsy
+* @name umbraco.directives.directive:umbImageThumbnail
 * @restrict E
 * @function
 * @description
-* Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
 angular.module("umbraco.directives")
 	.directive('umbImageThumbnail',
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index 0337a6fe6f..3fc99cce84 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -1,6 +1,6 @@
 /**
  * @ngdoc directive
- * @name umbraco.directives.directive:umbProperty
+ * @name umbraco.directives.directive:umbOverlay
  * @restrict E
  **/
 
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
index 204fa7bb86..baff935da7 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umblockedfield.directive.js
@@ -1,9 +1,9 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbContentName 
+* @name umbraco.directives.directive:umbLockedField 
 * @restrict E
 * @function
-* @description 
+* @description
 * Used by editors that require naming an entity. Shows a textbox/headline with a required validator within it's own form.
 **/
 (function() {
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
index d33a8edb48..e0678c1065 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfiledropzone.directive.js
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbContentName
+* @name umbraco.directives.directive:umbFileDropzone
 * @restrict E
 * @function
 * @description
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js
index b8123b9202..df4f68950e 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbsinglefileupload.directive.js
@@ -1,6 +1,6 @@
 /**
 * @ngdoc directive
-* @name umbraco.directives.directive:umbFileUpload
+* @name umbraco.directives.directive:umbSingleFileUpload
 * @function
 * @restrict A
 * @scope