diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs
index 3d963d6bf0..8959f97f92 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/ItemEditing/LiveEditingItemRenderer.cs
@@ -5,6 +5,7 @@ using umbraco.presentation.templateControls;
 using umbraco.NodeFactory;
 using umbraco.cms.businesslogic.web;
 using umbraco.interfaces;
+using Umbraco.Core;
 
 namespace umbraco.presentation.LiveEditing.Modules.ItemEditing
 {
@@ -13,7 +14,7 @@ namespace umbraco.presentation.LiveEditing.Modules.ItemEditing
     /// </summary>
     public class LiveEditingItemRenderer : ItemRenderer
     {
-        public const string RICHTEXTEDITOR_DATATYPE_ID = "{5E9B75AE-FACE-41c8-B47E-5F4B0FD82F83}";
+        //public const string RICHTEXTEDITOR_DATATYPE_ID = "{5E9B75AE-FACE-41c8-B47E-5F4B0FD82F83}";
         /// <summary>Returns the instance of <see cref="LiveEditingItemRenderer"/>.</summary>
         public new readonly static LiveEditingItemRenderer Instance = new LiveEditingItemRenderer();
 
@@ -101,7 +102,7 @@ namespace umbraco.presentation.LiveEditing.Modules.ItemEditing
                 try
                 {
                     IDataType dt = new Document(item.GetParsedNodeId().Value).getProperty(item.Field).PropertyType.DataTypeDefinition.DataType;
-                    if (dt.Id == new Guid(RICHTEXTEDITOR_DATATYPE_ID))
+                    if (dt.Id == new Guid(Constants.PropertyEditors.TinyMCEv3))
                     {
                         writer.AddAttribute("class", "liveEditingForceBlockMode");
                     }
diff --git a/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs b/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs
index 11ee9a247a..833c064db8 100644
--- a/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs
+++ b/src/umbraco.editorControls/tinyMCE3/tinymce3dataType.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Umbraco.Core;
 
 namespace umbraco.editorControls.tinyMCE3
 {
@@ -31,7 +32,7 @@ namespace umbraco.editorControls.tinyMCE3
         }
         public override Guid Id
         {
-            get { return new Guid("{5E9B75AE-FACE-41c8-B47E-5F4B0FD82F83}"); }
+            get { return new Guid(Constants.PropertyEditors.TinyMCEv3); }
         }
 
         public override string DataTypeName
diff --git a/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs b/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs
index 0c3fc5e424..2225f4f601 100644
--- a/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs
+++ b/src/umbraco.editorControls/tinymce/TinyMCEDataType.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Umbraco.Core;
 
 namespace umbraco.editorControls.tinymce
 {
@@ -31,7 +32,7 @@ namespace umbraco.editorControls.tinymce
 		}
 		public override Guid Id
 		{
-			get { return new Guid("{83722133-F80C-4273-BDB6-1BEFAA04A612}"); }
+			get { return new Guid(Constants.PropertyEditors.TinyMCE); }
 		}
 
 		public override string DataTypeName