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 4879fdd72b..5f79f921e0 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
@@ -116,6 +116,11 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
         return language;
     }
 
+    /**
+     * Gets toolbars for the inlite theme
+     * @param {any} configuredToolbar
+     * @param {any} tinyMceConfig
+     */
     function getToolbars(configuredToolbar, tinyMceConfig) {
 
         //the commands for selection/all
@@ -182,7 +187,7 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
                 //create a baseline Config to exten upon
                 var config = {
                     selector: "#" + args.htmlId,
-                    theme: "inlite",
+                    theme: args.theme ? args.theme : "inlite",
                     inline: true,
                     plugins: plugins,
                     valid_elements: tinyMceConfig.validElements,
@@ -197,7 +202,7 @@ function tinyMceService($log, $q, imageHelper, $locale, $http, $timeout, stylesh
                     language: getLanguage(),
 
                     //this would be for a theme other than inlite
-                    toolbar: args.toolbar,
+                    toolbar: args.toolbar.join(" "),
                     //these are for the inlite theme to work
                     insert_toolbar: toolbars.insertToolbar,
                     selection_toolbar: toolbars.selectionToolbar,
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index 341e8839af..3413285859 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -29,6 +29,7 @@
     background-position-x: 99%;
 }
 
+
 /* This used to be in place but I'm not sure its needed ... */
 
 /* TINYMCE IMAGE RESIZING LIMITS */
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 52aa19b659..c10fd989e8 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
@@ -74,7 +74,8 @@ angular.module("umbraco")
             promises.push(tinyMceService.getTinyMceEditorConfig({
                 htmlId: $scope.textAreaHtmlId,
                 stylesheets: editorConfig.stylesheets,
-                toolbar: editorConfig.toolbar
+                toolbar: editorConfig.toolbar,
+                theme: editorConfig.theme
             }));
 
             //wait for queue to end
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
index 245843ac84..f0fae34628 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.controller.js
@@ -19,6 +19,9 @@ angular.module("umbraco").controller("Umbraco.PrevalueEditors.RteController",
         if (!$scope.model.value.maxImageSize && $scope.model.value.maxImageSize != 0) {
             $scope.model.value.maxImageSize = cfg.maxImageSize;
         }
+        if (!$scope.model.value.theme) {
+            $scope.model.value.theme = "inlite";
+        }
 
         tinyMceService.configuration().then(function(config){
             $scope.tinyMceConfig = config;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index 4e4b37ba67..4d9b332fcb 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -1,32 +1,32 @@
 <div ng-controller="Umbraco.PrevalueEditors.RteController" class="rte-editor-preval">
 
-	<umb-control-group label="Toolbar" hide-label="false">
-		<div ng-repeat="cmd in tinyMceConfig.commands">
+    <umb-control-group label="Toolbar" hide-label="false">
+        <div ng-repeat="cmd in tinyMceConfig.commands">
             <label>
-			    <input type="checkbox" 
-				       ng-checked="selected(cmd, cmd.alias, model.value.toolbar)" 
-				       ng-model="cmd.selected" 
-				       ng-change="selectCommand(cmd)" /> 
+                <input type="checkbox"
+                       ng-checked="selected(cmd, cmd.alias, model.value.toolbar)"
+                       ng-model="cmd.selected"
+                       ng-change="selectCommand(cmd)" />
 
-				<!--<img ng-src="{{cmd.icon}}" />-->
+                <!--<img ng-src="{{cmd.icon}}" />-->
                 <i class="mce-ico" ng-class="(cmd.isCustom ? ' mce-i-custom ' : ' mce-i-') + cmd.fontIcon"></i>
 
                 {{cmd.name}}
             </label>
-		</div>
-	</umb-control-group>
+        </div>
+    </umb-control-group>
 
-	<umb-control-group label="Stylesheets" hide-label="0">
-		<div ng-repeat="css in stylesheets">
+    <umb-control-group label="Stylesheets" hide-label="0">
+        <div ng-repeat="css in stylesheets">
             <label>
-			    <input type="checkbox" 
-				       ng-checked="selected(css, css.name, model.value.stylesheets)" 
-				       ng-model="css.selected" 
-				       ng-change="selectStylesheet(css)" /> 
-		        {{css.name}}
+                <input type="checkbox"
+                       ng-checked="selected(css, css.name, model.value.stylesheets)"
+                       ng-model="css.selected"
+                       ng-change="selectStylesheet(css)" />
+                {{css.name}}
             </label>
-		</div>
-	</umb-control-group>
+        </div>
+    </umb-control-group>
 
     <umb-control-group label="Dimensions" description="Width x Height">
         <div class="vertical-align-items">
@@ -38,6 +38,15 @@
     <umb-control-group label="Maximum size for inserted images" description="0 to disable resizing">
         <div class="vertical-align-items">
             <input type="number" min="0" ng-model="model.value.maxImageSize" class="umb-property-editor-tiny" placeholder="Width/Height" /> Pixels
-        </div> 
+        </div>
+    </umb-control-group>
+
+    <umb-control-group label="Theme" description="Select classic or inline theme">
+        <div class="vertical-align-items">
+            <select ng-model="model.value.theme">
+                <option value="inlite">Inline</option>
+                <option value="modern">Classic</option>
+            </select>
+        </div>
     </umb-control-group>
 </div>