diff --git a/bl-plugins/quill/plugin.php b/bl-plugins/quill/plugin.php
index 7a7076de..583b093b 100644
--- a/bl-plugins/quill/plugin.php
+++ b/bl-plugins/quill/plugin.php
@@ -56,7 +56,7 @@ class pluginQuill extends Plugin {
 		$html .= '<input name="autosave" id="jsautosave" type="checkbox" value="1" '.($this->getDbField('autosave')?'checked':'').'>';
 		$html .= '<label class="forCheckbox" for="jsautosave">'.$Language->get('Autosave').'</label>';
 		$html .= '</div>';
-		
+
 		$html .= '<div>';
 		$html .= '<input type="hidden" name="spellChecker" value="0">';
 		$html .= '<input name="spellChecker" id="jsspellChecker" type="checkbox" value="1" '.($this->getDbField('spellChecker')?'checked':'').'>';
@@ -72,25 +72,43 @@ class pluginQuill extends Plugin {
 		global $Language;
 
 		$html = '';
-		if( $this->enabled() ) {
+		// Load CSS and JS only on Controllers in array.
+		if(in_array($layout['controller'], $this->loadWhenController))
+		{
 			$html .= '
 			<script>
 
-var quill = new Quill("#editor-container", {
-  modules: {
-    toolbar: [
-      [{ header: [1, 2, false] }],
-      ["bold", "italic", "underline"],
-      ["image"]
-    ]
-  },
-  placeholder: "asd",
-  theme: "snow"
-});
+				var toolbarOptions = [
+						["bold", "italic", "underline", "strike"],        // toggled buttons
+						["blockquote", "code-block"],
+
+						[{ "header": 1 }, { "header": 2 }],               // custom button values
+						[{ "list": "ordered"}, { "list": "bullet" }],
+						[{ "script": "sub"}, { "script": "super" }],      // superscript/subscript
+						[{ "indent": "-1"}, { "indent": "+1" }],          // outdent/indent
+						[{ "direction": "rtl" }],                         // text direction
+
+						[{ "size": ["small", false, "large", "huge"] }],  // custom dropdown
+						[{ "header": [1, 2, 3, 4, 5, 6, false] }],
+
+						[{ "color": [] }, { "background": [] }],          // dropdown with defaults from theme
+						[{ "font": [] }],
+						[{ "align": [] }],
+
+						["clean"]                                         // remove formatting button
+				];
+
+				var quill = new Quill("#jscontent", {
+				  modules: {
+				    toolbar: toolbarOptions
+				  },
+				  placeholder: "Compose an epic...",
+				  theme: "snow"
+				});
 			</script>
 			';
 		}
 
 		return $html;
 	}
-}
\ No newline at end of file
+}