diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
index 5d2d763ca3..5d030342ee 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
@@ -23,7 +23,7 @@ angular.module("umbraco.directives")
 
                 //queue file loading
                 if (typeof (tinymce) === "undefined") {
-                    promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", scope));
+                    promises.push(assetsService.loadJs("lib/tinymce5/tinymce.min.js", scope));
                 }
 
                 var toolbar = ["code", "styleselect", "bold", "italic", "alignleft", "aligncenter", "alignright", "bullist", "numlist", "link", "umbmediapicker", "umbembeddialog"];
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
index 5f79f921e0..8988c489e1 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -187,9 +187,9 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
                 //create a baseline Config to exten upon
                 var config = {
                     selector: "#" + args.htmlId,
-                    theme: args.theme ? args.theme : "inlite",
-                    inline: true,
-                    plugins: plugins,
+                    theme: "silver",//args.theme ? args.theme : "inlite",
+                    //inline: true,
+                    //plugins: plugins,
                     valid_elements: tinyMceConfig.validElements,
                     invalid_elements: tinyMceConfig.inValidElements,
                     extended_valid_elements: extendedValidElements,
@@ -199,13 +199,14 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
                     autoresize_bottom_margin: 0,
                     content_css: styles.stylesheets,
                     style_formats: styles.styleFormats,
-                    language: getLanguage(),
+                    //language: getLanguage(),
 
                     //this would be for a theme other than inlite
-                    toolbar: args.toolbar.join(" "),
+                    //toolbar: args.toolbar.join(" "),
+
                     //these are for the inlite theme to work
-                    insert_toolbar: toolbars.insertToolbar,
-                    selection_toolbar: toolbars.selectionToolbar,
+                    //insert_toolbar: toolbars.insertToolbar,
+                    //selection_toolbar: toolbars.selectionToolbar,
 
                     body_class: 'umb-rte',
                     //see http://archive.tinymce.com/wiki.php/Configuration:cache_suffix
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index c10fd989e8..e7de12ffd3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -65,7 +65,7 @@ angular.module("umbraco")
 
             //queue file loading
             if (typeof tinymce === "undefined") { // Don't reload tinymce if already loaded
-                promises.push(assetsService.loadJs("lib/tinymce/tinymce.min.js", $scope));
+                promises.push(assetsService.loadJs("lib/tinymce5/tinymce.min.js", $scope));
             }
 
             //stores a reference to the editor