diff --git a/assets/plugins/tinymce4/bridge.tinymce4.inc.php b/assets/plugins/tinymce4/bridge.tinymce4.inc.php
index 7c2cbab737..9f36e24a77 100755
--- a/assets/plugins/tinymce4/bridge.tinymce4.inc.php
+++ b/assets/plugins/tinymce4/bridge.tinymce4.inc.php
@@ -344,7 +344,7 @@ public function bridge_theme($selector) {
 
         // inlite-theme is only compatible with inline-mode / frontend
         if($this->modxParams['skintheme'] == 'inlite' && $modx->event->name != 'OnWebPagePrerender') {
-            $this->set('theme', 'modern');     // Fallback to modern-theme in backend
+            $this->force('theme', 'modern');     // Fallback to modern-theme in backend
         }
 
         return NULL;
diff --git a/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php b/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php
index 8e18958f5f..977e63cc76 100755
--- a/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php
+++ b/assets/plugins/tinymce4/gsettings/gsettings.rows.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-$params = isset($params) ? $params : array('base_url'=>'', 'skinsDirectory'=>'');
+$params = isset($params) ? $params : array('base_url'=>'', 'skinsDirectory'=>'', 'skinthemeDirectory'=>'');
 // Hold general settings based on old Modx TinyMCE-Settings
 
 // Settings interface rows configuration
diff --git a/assets/plugins/tinymce4/plugin.tinymce.inc.php b/assets/plugins/tinymce4/plugin.tinymce.inc.php
index 7c40c7d037..7750b5f63b 100755
--- a/assets/plugins/tinymce4/plugin.tinymce.inc.php
+++ b/assets/plugins/tinymce4/plugin.tinymce.inc.php
@@ -4,11 +4,7 @@
 if (!defined('MODX_BASE_PATH')) { die('What are you doing? Get out of here!'); }
 
 // Init
-if( !file_exists(MODX_BASE_PATH."assets/lib/class.modxRTEbridge.php")) { // Add Fall-Back for now
-    require_once(MODX_BASE_PATH."assets/plugins/tinymce4/class.modxRTEbridge.php"); 
-} else {
-    require_once(MODX_BASE_PATH."assets/lib/class.modxRTEbridge.php");
-}
+require_once(MODX_BASE_PATH."assets/lib/class.modxRTEbridge.php");
 require_once(MODX_BASE_PATH."assets/plugins/tinymce4/bridge.tinymce4.inc.php");
 
 $e = &$modx->event;
@@ -46,11 +42,11 @@
         if ($editor === $editorLabel) {
             // Handle introtext-RTE
             if($introtextRte == 'enabled' && isset($rte->pluginParams['elements']) && !defined($editor . '_INIT_INTROTEXT')) {
-				define($editor . '_INIT_INTROTEXT', 1);
+                define($editor . '_INIT_INTROTEXT', 1);
                 if(!in_array('introtext',$rte->pluginParams['elements'])) {
-					$rte->pluginParams['elements'][]      = 'introtext';
-					$rte->tvOptions['introtext']['theme'] = 'introtext';
-				};
+                    $rte->pluginParams['elements'][]      = 'introtext';
+                    $rte->tvOptions['introtext']['theme'] = 'introtext';
+                };
             }
             $script = $rte->getEditorScript();
             $e->output($script);