diff --git a/src/components/com_kunena/template/crypsis/layouts/widget/editor/bbcode.php b/src/components/com_kunena/template/crypsis/layouts/widget/editor/bbcode.php
deleted file mode 100644
index b55530aa704..00000000000
--- a/src/components/com_kunena/template/crypsis/layouts/widget/editor/bbcode.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsis
- * @subpackage      Topic
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die();
-use Joomla\CMS\Language\Text;
-
-echo $this->subLayout('Widget/Datepicker');
-
-// Load caret.js always before atwho.js script and use it for autocomplete, emojiis...
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-$pollcheck = isset($this->poll);
-$this->getBBcodesEnabled();
-$topictemplate = !KunenaConfig::getInstance()->pickup_category;
-?>
-<script>
-	function localstorage() {
-		localStorage.getItem("copyKunenaeditor");
-	}
-
-	function localstorageremove() {
-		localStorage.removeItem("copyKunenaeditor");
-	}
-</script>
-<div class="control-group">
-	<label class="control-label"><?php echo Text::_('COM_KUNENA_MESSAGE'); ?></label>
-	<div class="controls">
-		<ul id="tabs_kunena_editor" class="nav nav-tabs span12">
-			<li><a href="#write" data-toggle="tab"><?php echo Text::_('COM_KUNENA_EDITOR_TAB_WRITE_LABEL') ?></a></li>
-			<li><a href="#preview" data-toggle="tab"><?php echo Text::_('COM_KUNENA_PREVIEW') ?></a></li>
-		</ul>
-		<textarea class="span12" name="message" id="editor" rows="12" tabindex="7" required="required"
-		          placeholder="<?php echo Text::_('COM_KUNENA_ENTER_MESSAGE') ?>"><?php if (!empty($this->message->getCategory()->topictemplate) && !$this->message->getTopic()->first_post_id && $topictemplate)
-			{
-				echo $this->message->getCategory()->topictemplate;
-			}
-			else
-			{
-				echo $this->escape($this->message->message);
-			} ?></textarea>
-	</div>
-
-	<!-- Hidden preview placeholder -->
-	<div class="controls" id="kbbcode-preview" style="display: none;"></div>
-</div>
-
-<!-- Bootstrap modal to be used with bbcode editor -->
-<div id="modal-map" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_MAP_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TYPE') ?>: <select id="modal-map-type">
-				<option value="HYBRID"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_HYBRID') ?></option>
-				<option value="ROADMAP"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ROADMAP') ?></option>
-				<option value="TERRAIN"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TERRAIN') ?></option>
-				<option value="SATELLITE"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_SATELLITE') ?></option>
-			</select><br/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ZOOM_LEVEL') ?>: <select id="modal-map-zoomlevel">
-				<option value="2">2</option>
-				<option value="4">4</option>
-				<option value="6">6</option>
-				<option value="8">8</option>
-				<option value="10">10</option>
-				<option value="12">12</option>
-				<option value="14">14</option>
-				<option value="16">16</option>
-				<option value="18">18</option>
-			</select><br/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY') ?>: <input name="modal-map-city"
-			                                                                            id="modal-map-city" type="text"
-			                                                                            value=""
-			                                                                            placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY_DESC') ?>"/>
-		</p>
-	</div>
-	<div class="modal-footer">
-		<button id="map-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<?php $codeTypes = $this->getCodeTypes();
-
-if (!empty($codeTypes))
-	:
-	?>
-	<div id="modal-code" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" style="display: none;">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_CODE_SETTINGS') ?></h3>
-		</div>
-		<div class="modal-body">
-			<p>
-				<?php echo $codeTypes; ?>
-			</p>
-		</div>
-		<div class="modal-footer">
-			<button id="code-modal-submit"
-			        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-			<button class="btn" data-dismiss="modal"
-			        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-picture" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_SIZE') ?>:
-			<select id="kpicture-size-list-modal"
-			        name="modal-picture-size" class="kbutton">
-				<?php
-				$vid_provider = array('', '20', '40', '80', '100', '150', '200', '250', '500', '1000');
-
-				foreach ($vid_provider as $vid_type)
-				{
-					$vid_type = explode(',', $vid_type);
-					echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-				}
-				?>
-			</select>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_ALT') ?>: <input class="form-control"
-			                                                                                     name="modal-picture-alt"
-			                                                                                     id="modal-picture-alt"
-			                                                                                     type="text" value=""
-			                                                                                     placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_ALT_PLACEHOLDER') ?>"/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL') ?>: <input
-					name="modal-picture-url" id="modal-picture-url"
-					type="text" value=""
-					placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL_PLACEHOLDER') ?>"/>
-		</p>
-	</div>
-	<div class="modal-footer">
-		<button id="picture-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<div id="modal-link" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL') ?>:
-			<input name="modal-link-url" id="modal-link-url" type="text" value=""
-			       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL_PLACEHOLDER') ?>"/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT') ?>:
-			<input name="modal-link-text" id="modal-link-text" type="text" value=""
-			       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT_PLACEHOLDER') ?>"/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_CLASS') ?>:
-			<input name="modal-link-class" id="modal-link-class" type="text" value=""
-			       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_CLASS_PLACEHOLDER') ?>"/>
-		</p>
-	</div>
-	<div class="modal-footer">
-		<button id="link-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<div id="modal-video-settings" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_SIZE') ?>: <input name="modal-video-size"
-		                                                                                      id="modal-video-size"
-		                                                                                      type="text" maxlength="5"
-		                                                                                      size="5" value=""/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_WIDTH') ?>: <input name="modal-video-width"
-			                                                                                    id="modal-video-width"
-			                                                                                    type="text"
-			                                                                                    maxlength="5" size="5"
-			                                                                                    value=""/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_HEIGHT') ?>: <input
-					name="modal-video-height" id="modal-video-height"
-					type="text" maxlength="5" size="5" value=""/>
-			<?php
-			echo Text::_('COM_KUNENA_EDITOR_VIDEO_PROVIDER');
-			?>
-			<select id="kvideoprovider-list-modal"
-			        name="provider" class="kbutton">
-				<?php
-				$vid_provider = array('', 'Bofunk', 'Break', 'Clipfish', 'DivX,divx]http://', 'Flash,flash]http://', 'FlashVars,flashvars param=]http://', 'MediaPlayer,mediaplayer]http://', 'Metacafe', 'MySpace', 'QuickTime,quicktime]http://', 'RealPlayer,realplayer]http://', 'RuTube', 'Sapo', 'Streetfire', 'Veoh', 'Videojug', 'Vimeo', 'Wideo.fr', 'YouTube');
-
-				foreach ($vid_provider as $vid_type)
-				{
-					$vid_type = explode(',', $vid_type);
-					echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-				}
-				?>
-			</select>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_ID') ?>: <input name="modal-video-id"
-			                                                                                 id="modal-video-id"
-			                                                                                 type="text"
-			                                                                                 maxlength="30" size="11"
-			                                                                                 value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="videosettings-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<div id="modal-video-urlprovider" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_VIDEO') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER_URL') ?>: <input
-					name="modal-video-urlprovider-input"
-					id="modal-video-urlprovider-input" type="text"
-					value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="videourlprovider-modal-submit"
-		        class="btn btn-primary modal-submit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<?php if ($pollcheck) : ?>
-	<div id="modal-poll-not-allowed-to-edit" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="poll-not-allowed-to-edit"
-	     aria-hidden="true" data-backdrop="false" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="poll-not-allowed-to-edit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_NOT_ALLOWED_TO_EDIT') ?></h3>
-				</div>
-				<div class="modal-body">
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_NOT_ALLOWED_TO_EDIT') ?>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div id="modal-poll-settings" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" data-backdrop="false" style="display: none;">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_SETTINGS') ?></h3>
-		</div>
-		<div class="modal-body">
-			<div id="kbbcode-poll-options">
-				<div>
-					<label class="kpoll-title-lbl"
-					       for="kpoll-title"><?php echo Text::_('COM_KUNENA_POLL_TITLE'); ?></label>
-					<input type="text" class="inputbox" name="poll_title" id="kpoll-title"
-					       maxlength="150" size="40"
-					       value="<?php echo $this->escape($this->poll->title) ?>"/>
-					<?php echo KunenaIcons::poll_add(); ?>
-					<?php echo KunenaIcons::poll_rem(); ?>
-				</div>
-				<div>
-					<label class="kpoll-term-lbl"
-					       for="kpoll-time-to-live"><?php echo Text::_('COM_KUNENA_POLL_TIME_TO_LIVE'); ?></label>
-					<div id="datepoll-container">
-						<div class="input-append date">
-							<input type="text" class="kpoll-time-to-live-input" id="poll_time_to_live"
-							       data-date-format="mm/dd/yyyy"
-							       value="<?php echo !empty($this->poll->polltimetolive) ? $this->poll->polltimetolive : '' ?>"><span
-									class="add-on"><?php echo KunenaIcons::grid(); ?></span>
-						</div>
-					</div>
-				</div>
-				<div class="clearfix"></div>
-				<div id="kpoll-alert-error" class="alert" style="display:none;margin-top:10px;">
-					<button type="button" class="close" data-dismiss="alert">&times;</button>
-					<?php echo Text::sprintf('COM_KUNENA_ALERT_WARNING_X', Text::_('COM_KUNENA_POLL_NUMBER_OPTIONS_MAX_NOW')) ?>
-				</div>
-				<?php
-				if ($this->poll->exists())
-				{
-					$x = 1;
-
-					foreach ($this->poll->getOptions() as $poll_option)
-					{
-						echo '<div class="polloption"><label>Option ' . $x . '</label><input type="text" size="100" id="field_option' . $x . '" name="polloptionsID[' . $poll_option->id . ']" value="' . $poll_option->text . '" /></div>';
-						$x++;
-					}
-				} ?>
-				<input type="hidden" name="nb_options_allowed" id="nb_options_allowed"
-				       value="<?php echo $this->config->pollnboptions; ?>"/>
-				<input type="hidden" name="number_total_options" id="numbertotal"
-				       value="<?php echo !empty($this->polloptionstotal) ? $this->escape($this->polloptionstotal) : '' ?>"/>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<button id="poll-settings-modal-submit"
-			        class="btn btn-primary"><?php echo $this->poll->exists() ? Text::_('COM_KUNENA_EDITOR_MODAL_EDIT_LABEL') : Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-			<button class="btn" data-dismiss="modal"
-			        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			<button id="clearpoll" class="btn btn-danger" data-dismiss="modal"
-			        aria-hidden="true"><?php echo Text::_('COM_KUNENA_CLEAR_MODAL') ?></button>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-emoticons" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel">Emoticons</h3>
-	</div>
-	<div class="modal-body">
-		<div id="smilie"><?php
-			$emoticons = KunenaHtmlParser::getEmoticons(0, 1);
-
-			foreach ($emoticons as $emo_code => $emo_url)
-			{
-				$data   = getimagesize(JPATH_ROOT . '/' . $emo_url);
-				$width  = $data[0];
-				$height = $data[1];
-				echo '<img class="smileyimage" src="' . $emo_url . '" border="0" width="' . $width . '" height="' . $height . '"  alt="' . $emo_code . ' " title="' . $emo_code . ' " style="cursor:pointer"/> ';
-			}
-			?>
-		</div>
-	</div>
-	<div class="modal-footer">
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<!-- end of Bootstrap modal to be used with bbcode editor -->
-<div class="control-group">
-	<div class="controls">
-		<input type="hidden" id="kurl_emojis" name="kurl_emojis"
-		       value="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=topic&layout=listemoji&format=raw') ?>"/>
-		<input type="hidden" id="kemojis_allowed" name="kemojis_allowed"
-		       value="<?php echo $this->config->disemoticons ? 0 : 1 ?>"/>
-	</div>
-</div>
diff --git a/src/components/com_kunena/template/crypsis/layouts/widget/editor/wysibb.php b/src/components/com_kunena/template/crypsis/layouts/widget/editor/wysibb.php
deleted file mode 100644
index c38122ef35d..00000000000
--- a/src/components/com_kunena/template/crypsis/layouts/widget/editor/wysibb.php
+++ /dev/null
@@ -1,411 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsis
- * @subpackage      Topic
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die();
-use Joomla\CMS\Language\Text;
-
-$this->ktemplate  = KunenaFactory::getTemplate();
-$templatesettings = $this->ktemplate->params;
-
-$this->addScript('assets/js/jquery.wysibb.js');
-$this->addStyleSheet('assets/css/wbbtheme.css');
-$this->addScript('assets/js/wysibb.lang.js');
-echo $this->subLayout('Widget/Datepicker');
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BOLD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ITALIC');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_UNDERLINE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_STRIKE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LINK');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_IMAGE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUB');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYLEFT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYCENTER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYRIGHT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_TABLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BULLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_NUMLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_QUOTE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_OFFTOP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CODE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SPOILER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTCOLOR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTFAMILY');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERYSMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_SMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_NORMAL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_BIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERTBIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SMILEBOX');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIDEO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVEFORMAT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMGSRC_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_BTN');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ADD_ATTACH');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_VIDEO_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CLOSE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SAVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CANCEL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VALIDATION_ERR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ERROR_ONUPLOAD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LOADING');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_AUTO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIEWS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_DOWNLOADS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM3');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM4');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM5');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM6');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM7');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM8');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM9');
-
-$topictemplate = !KunenaConfig::getInstance()->pickup_category;
-$settings      = $templatesettings->get('wysibb');
-?>
-
-<script>
-	var wbbOpt = {
-		lang: "kunena",
-		buttons: "<?php echo $settings;?>",
-		// Todo More Support
-		traceTextarea: true,
-		smileList: [
-			{title: CURLANG.sm1, img: '<img src="media/kunena/emoticons/blink.png">', bbcode: ":)"}
-		],
-		allButtons: {
-			custom: {
-				title: 'Maps',
-				buttonText: 'Maps',
-				modal: {
-					title: "Maps",
-					width: "600px",
-					tabs: [
-						{
-							input: [ //List of form fields
-								{param: "SELTEXT", title: "Enter City", type: "div"},
-								{param: "ZOOM", title: "Zoom Level", type: "div"}
-							]
-						}
-					],
-					onLoad: function () {
-						//Callback function that will be called after the display of a modal window
-					},
-					onSubmit: function () {
-						//Callback function that will be called by pressing the "Save"
-						//If function return false, it means sending data WysiBB not be made
-					}
-				},
-				transform: {
-					'<span>{SELTEXT}</span>': '[map zoom="{ZOOM}"]{SELTEXT}[/map]'
-				}
-			}
-		}
-	};
-	jQuery(function ($) {
-		$("#editor").wysibb(wbbOpt);
-	});
-</script>
-
-<div class="control-group">
-	<label class="control-label"><?php echo Text::_('COM_KUNENA_MESSAGE'); ?></label>
-	<div class="controls">
-		<textarea class="span12" name="message" id="editor" rows="12" tabindex="7"
-		          placeholder="<?php echo Text::_('COM_KUNENA_ENTER_MESSAGE') ?>"><?php if (!empty($this->message->getCategory()->topictemplate) && !$this->message->getTopic()->first_post_id && $topictemplate)
-			{
-				echo $this->message->getCategory()->topictemplate;
-			}
-			else
-			{
-				echo $this->escape($this->message->message);
-			} ?></textarea>
-	</div>
-</div>
-
-<!-- Bootstrap modal to be used with bbcode editor -->
-<div id="modal-map" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_MAP_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TYPE') ?>: <select id="modal-map-type">
-				<option value="HYBRID"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_HYBRID') ?></option>
-				<option value="ROADMAP"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ROADMAP') ?></option>
-				<option value="TERRAIN"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TERRAIN') ?></option>
-				<option value="SATELLITE"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_SATELLITE') ?></option>
-			</select><br/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ZOOM_LEVEL') ?>: <select id="modal-map-zoomlevel">
-				<option value="2">2</option>
-				<option value="4">4</option>
-				<option type="6">6</option>
-				<option value="8">8</option>
-				<option value="10">10</option>
-				<option value="12">12</option>
-				<option value="14">14</option>
-				<option value="16">16</option>
-				<option value="18">18</option>
-			</select><br/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY') ?>: <input name="modal-map-city"
-			                                                                            id="modal-map-city" type="text"
-			                                                                            value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="map-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<?php $codeTypes = $this->getCodeTypes();
-if (!empty($codeTypes)) : ?>
-	<div id="modal-code" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" style="display: none;">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_CODE_SETTINGS') ?></h3>
-		</div>
-		<div class="modal-body">
-			<p>
-				<?php echo $codeTypes; ?>
-			</p>
-		</div>
-		<div class="modal-footer">
-			<button id="code-modal-submit"
-			        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-			<button class="btn" data-dismiss="modal"
-			        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-picture" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_SIZE') ?>: <input
-					name="modal-picture-size" id="modal-picture-size"
-					type="text" value=""/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL') ?>: <input
-					name="modal-picture-url" id="modal-picture-url"
-					type="text" value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="picture-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<div id="modal-link" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL') ?>: <input name="modal-link-url"
-		                                                                                     id="modal-link-url"
-		                                                                                     type="text"
-		                                                                                     value=""/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT') ?>: <input name="modal-link-text"
-			                                                                                   id="modal-link-text"
-			                                                                                   type="text"
-			                                                                                   value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="link-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<div id="modal-video-settings" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_SETTINGS') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_SIZE') ?>: <input name="modal-video-size"
-		                                                                                      id="modal-video-size"
-		                                                                                      type="text" maxlength="5"
-		                                                                                      size="5" value=""/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_WIDTH') ?>: <input name="modal-video-width"
-			                                                                                    id="modal-video-width"
-			                                                                                    type="text"
-			                                                                                    maxlength="5" size="5"
-			                                                                                    value=""/>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_HEIGHT') ?>: <input
-					name="modal-video-height" id="modal-video-height"
-					type="text" maxlength="5" size="5" value=""/>
-			<?php
-			echo Text::_('COM_KUNENA_EDITOR_VIDEO_PROVIDER');
-			?>
-			<select id="kvideoprovider-list-modal"
-			        name="provider" class="kbutton">
-				<?php
-				$vid_provider = array('', 'Bofunk', 'Break', 'Clipfish', 'DivX,divx]http://', 'Flash,flash]http://', 'FlashVars,flashvars param=]http://', 'MediaPlayer,mediaplayer]http://', 'Metacafe', 'MySpace', 'QuickTime,quicktime]http://', 'RealPlayer,realplayer]http://', 'RuTube', 'Sapo', 'Streetfire', 'Veoh', 'Videojug', 'Vimeo', 'Wideo.fr', 'YouTube');
-				foreach ($vid_provider as $vid_type)
-				{
-					$vid_type = explode(',', $vid_type);
-					echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-				}
-				?>
-			</select>
-			<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_ID') ?>: <input name="modal-video-id"
-			                                                                                 id="modal-video-id"
-			                                                                                 type="text"
-			                                                                                 maxlength="30" size="11"
-			                                                                                 value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="videosettings-modal-submit"
-		        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<div id="modal-video-urlprovider" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER') ?></h3>
-	</div>
-	<div class="modal-body">
-		<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER_URL') ?>: <input
-					name="modal-video-urlprovider-input"
-					id="modal-video-urlprovider-input" type="text"
-					value=""/></p>
-	</div>
-	<div class="modal-footer">
-		<button id="videourlprovider-modal-submit"
-		        class="btn btn-primary modal-submit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-	</div>
-</div>
-<?php if (!$this->message->parent && isset($this->poll)) : ?>
-	<div id="modal-poll-settings" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" style="display: none;">
-		<div class="modal-header">
-			<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_SETTINGS') ?></h3>
-		</div>
-		<div class="modal-body">
-			<div id="kbbcode-poll-options">
-				<div>
-					<label class="kpoll-title-lbl"
-					       for="kpoll-title"><?php echo Text::_('COM_KUNENA_POLL_TITLE'); ?></label>
-					<input type="text" class="inputbox" name="poll_title" id="kpoll-title"
-					       maxlength="150" size="40"
-					       value="<?php echo $this->escape($this->poll->title) ?>"/>
-					<i id="kbutton-poll-add" class="icon-plus btn btn-small"
-					   alt="<?php echo Text::_('COM_KUNENA_POLL_ADD_POLL_OPTION'); ?>"> </i>
-					<i id="kbutton-poll-rem" class="icon-minus btn btn-small"
-					   alt="<?php echo Text::_('COM_KUNENA_POLL_REMOVE_POLL_OPTION'); ?>"> </i>
-				</div>
-				<div>
-					<label class="kpoll-term-lbl"
-					       for="kpoll-time-to-live"><?php echo Text::_('COM_KUNENA_POLL_TIME_TO_LIVE'); ?></label>
-					<div id="datepoll-container" class="span5 col-md-5">
-						<div class="input-append date">
-							<input type="text" class="span12 kpoll-time-to-live-input" name="poll_time_to_live"
-							       data-date-format="mm/dd/yyyy"
-							       value="<?php echo !empty($this->poll->polltimetolive) ? $this->poll->polltimetolive : '' ?>"><span
-									class="add-on"><?php echo KunenaIcons::grid(); ?></span>
-						</div>
-					</div>
-				</div>
-				<div class="clearfix"></div>
-				<div id="kpoll-alert-error" class="alert" style="display:none;">
-					<button type="button" class="close" data-dismiss="alert">&times;</button>
-					<?php echo Text::sprintf('COM_KUNENA_ALERT_WARNING_X', Text::_('COM_KUNENA_POLL_NUMBER_OPTIONS_MAX_NOW')) ?>
-				</div>
-				<div>
-					<?php
-					if ($this->poll->exists())
-					{
-						$x = 1;
-
-						foreach ($this->poll->getOptions() as $poll_option)
-						{
-							echo '<div class="polloption"><label>Option ' . $x . '</label><input type="text" size="100" id="field_option' . $x . '" name="polloptionsID[' . $poll_option->id . ']" value="' . $poll_option->text . '" /></div>';
-							$x++;
-						}
-					} ?>
-				</div>
-				<input type="hidden" name="nb_options_allowed" id="nb_options_allowed"
-				       value="<?php echo $this->config->pollnboptions; ?>"/>
-				<input type="hidden" name="number_total_options" id="numbertotal"
-				       value="<?php echo !empty($this->polloptionstotal) ? $this->escape($this->polloptionstotal) : ''; ?>"/>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<button id="poll-settings-modal-submit"
-			        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL'); ?></button>
-			<button class="btn" data-dismiss="modal"
-			        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL'); ?></button>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-emoticons" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-		<h3 id="myModalLabel">Emoticons</h3>
-	</div>
-	<div class="modal-body">
-		<div id="smilie"><?php
-			$emoticons = KunenaHtmlParser::getEmoticons(0, 1);
-			foreach ($emoticons as $emo_code => $emo_url)
-			{
-				echo '<img class="smileyimage" src="' . $emo_url . '" border="0" width="20" height="20" alt="' . $emo_code . ' " title="' . $emo_code . ' " style="cursor:pointer"/> ';
-			}
-			?>
-		</div>
-	</div>
-	<div class="modal-footer">
-		<button class="btn" data-dismiss="modal"
-		        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL'); ?></button>
-	</div>
-</div>
-<!-- end of Bootstrap modal to be used with bbcode editor -->
-<div class="control-group">
-	<div class="controls">
-		<input type="hidden" id="kurl_emojis" name="kurl_emojis"
-		       value="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=topic&layout=listemoji&format=raw') ?>"/>
-		<input type="hidden" id="kemojis_allowed" name="kemojis_allowed"
-		       value="<?php echo $this->config->disemoticons ? 0 : 1; ?>"/>
-	</div>
-</div>
diff --git a/src/components/com_kunena/template/crypsis/layouts/widget/editor/wysibb_quick.php b/src/components/com_kunena/template/crypsis/layouts/widget/editor/wysibb_quick.php
deleted file mode 100644
index 8d1aa2c33fb..00000000000
--- a/src/components/com_kunena/template/crypsis/layouts/widget/editor/wysibb_quick.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsis
- * @subpackage      Topic
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die();
-use Joomla\CMS\Language\Text;
-
-$this->addScript('assets/js/jquery.wysibb.js');
-$this->addStyleSheet('assets/css/wbbtheme.css');
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-$this->addScript('assets/js/wysibb.lang.js');
-
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BOLD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ITALIC');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_UNDERLINE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_STRIKE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LINK');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_IMAGE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUB');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYLEFT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYCENTER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYRIGHT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_TABLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BULLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_NUMLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_QUOTE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_OFFTOP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CODE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SPOILER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTCOLOR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTFAMILY');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERYSMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_SMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_NORMAL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_BIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERTBIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SMILEBOX');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIDEO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVEFORMAT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMGSRC_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_BTN');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ADD_ATTACH');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_VIDEO_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CLOSE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SAVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CANCEL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VALIDATION_ERR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ERROR_ONUPLOAD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LOADING');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_AUTO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIEWS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_DOWNLOADS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM3');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM4');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM5');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM6');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM7');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM8');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM9');
-$this->ktemplate  = KunenaFactory::getTemplate();
-$templatesettings = $this->ktemplate->params;
-$settings         = $templatesettings->get('wysibb');
-?>
-<script>
-	var wbbOpt = {
-		lang: "kunena",
-		buttons: "<?php echo $settings;?>"
-	};
-	jQuery(function ($) {
-		$('[id^=editor-]').wysibb(wbbOpt);
-	});
-</script>
-
-<textarea class="span12" name="message" id="editor-<?php echo $this->message->id; ?>" rows="12" tabindex="7"></textarea>
diff --git a/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/bbcode.php b/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/bbcode.php
deleted file mode 100644
index ff7bc0dd641..00000000000
--- a/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/bbcode.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/**
- * Kunena Component
- * @package         Kunena.Template.Crypsis
- * @subpackage      Layout.Widget
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die;
-use Joomla\CMS\Language\Text;
-
-// Load caret.js always before atwho.js script and use it for autocomplete, emojiis...
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-
-echo $this->subLayout('Widget/Datepicker');
-$this->getBBcodesEnabled();
-$topictemplate = !KunenaConfig::getInstance()->pickup_category;
-?>
-<div class="form-group">
-	<label class="control-label col-md-4"><?php echo Text::_('COM_KUNENA_MESSAGE'); ?></label>
-	<div class="controls">
-		<ul id="tabs_kunena_editor" class="nav nav-tabs">
-			<li class="active"><a href="#write"
-			                      data-toggle="tab"><?php echo Text::_('COM_KUNENA_EDITOR_TAB_WRITE_LABEL') ?></a></li>
-			<li><a href="#preview" data-toggle="tab"><?php echo Text::_('COM_KUNENA_PREVIEW') ?></a></li>
-		</ul>
-		<textarea class="form-control" name="message" id="editor" rows="12" tabindex="7" required="required"
-		          placeholder="<?php echo Text::_('COM_KUNENA_ENTER_MESSAGE') ?>"><?php if (!empty($this->message->getCategory()->topictemplate) && !$this->message->getTopic()->first_post_id && $topictemplate)
-			{
-				echo $this->message->getCategory()->topictemplate;
-			}
-			else
-			{
-				echo $this->escape($this->message->message);
-			} ?></textarea>
-	</div>
-
-	<!-- Hidden preview placeholder -->
-	<div class="controls" id="kbbcode-preview" style="display: none;"></div>
-</div>
-
-<!-- Bootstrap modal to be used with bbcode editor -->
-<div id="modal-map" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-     style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_MAP_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TYPE') ?>: <select id="modal-map-type">
-						<option value="HYBRID"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_HYBRID') ?></option>
-						<option value="ROADMAP"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ROADMAP') ?></option>
-						<option value="TERRAIN"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TERRAIN') ?></option>
-						<option value="SATELLITE"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_SATELLITE') ?></option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ZOOM_LEVEL') ?>: <select
-							id="modal-map-zoomlevel">
-						<option value="2">2</option>
-						<option value="4">4</option>
-						<option value="6">6</option>
-						<option value="8">8</option>
-						<option value="10">10</option>
-						<option value="12">12</option>
-						<option value="14">14</option>
-						<option value="16">16</option>
-						<option value="18">18</option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY') ?>:
-					<input name="modal-map-city" id="modal-map-city"
-					       type="text" value=""
-					       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY_DESC') ?>"/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="map-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php $codeTypes = $this->getCodeTypes();
-if (!empty($codeTypes)) : ?>
-	<div id="modal-code" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_CODE_SETTINGS') ?></h3>
-				</div>
-				<div class="modal-body">
-					<p>
-						<?php echo $codeTypes; ?>
-					</p>
-				</div>
-				<div class="modal-footer">
-					<button id="code-modal-submit"
-					        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-default" data-dismiss="modal"
-					        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-picture" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-     style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_SIZE') ?>:
-					<select id="kpicture-size-list-modal"
-					        name="modal-picture-size" class="kbutton">
-						<?php
-						$vid_provider = array('', '20', '40', '80', '100', '150', '200', '250', '500', '1000');
-
-						foreach ($vid_provider as $vid_type)
-						{
-							$vid_type = explode(',', $vid_type);
-							echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-						}
-						?>
-					</select>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_ALT') ?>: <input
-							class="form-control" name="modal-picture-alt"
-							id="modal-picture-alt" type="text" value=""
-							placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_ALT_PLACEHOLDER') ?>"/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL') ?>: <input
-							name="modal-picture-url"
-							id="modal-picture-url" type="text" value=""
-							placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL_PLACEHOLDER') ?>"/>
-				</p>
-			</div>
-			<div class="modal-footer">
-				<button id="picture-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-link" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-     style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL') ?>:
-					<input name="modal-link-url" id="modal-link-url" type="text" value=""
-					       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL_PLACEHOLDER') ?>"/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT') ?>:
-					<input name="modal-link-text" id="modal-link-text" type="text" value=""
-					       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT_PLACEHOLDER') ?>"/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_CLASS') ?>:
-					<input name="modal-link-class" id="modal-link-class" type="text" value=""
-					       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_CLASS_PLACEHOLDER') ?>"/>
-				</p>
-			</div>
-			<div class="modal-footer">
-				<button id="link-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_SIZE') ?>: <input
-							class="form-control" name="modal-video-size"
-							id="modal-video-size" type="text" maxlength="5"
-							size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_WIDTH') ?>: <input
-							class="form-control" name="modal-video-width"
-							id="modal-video-width" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_HEIGHT') ?>: <input
-							class="form-control"
-							name="modal-video-height"
-							id="modal-video-height" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php
-					echo Text::_('COM_KUNENA_EDITOR_VIDEO_PROVIDER');
-					?>
-					<select id="kvideoprovider-list-modal"
-					        name="provider" class="kbutton form-control">
-						<?php
-						$vid_provider = array('', 'Bofunk', 'Break', 'Clipfish', 'DivX,divx]http://', 'Flash,flash]http://', 'FlashVars,flashvars param=]http://', 'MediaPlayer,mediaplayer]http://', 'Metacafe', 'MySpace', 'QuickTime,quicktime]http://', 'RealPlayer,realplayer]http://', 'RuTube', 'Sapo', 'Streetfire', 'Veoh', 'Videojug', 'Vimeo', 'Wideo.fr', 'YouTube');
-						foreach ($vid_provider as $vid_type)
-						{
-							$vid_type = explode(',', $vid_type);
-							echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-						}
-						?>
-					</select>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_ID') ?>: <input
-							class="form-control" name="modal-video-id"
-							id="modal-video-id" type="text" maxlength="30"
-							size="11" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videosettings-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-urlprovider" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_VIDEO') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER_URL') ?>: <input
-							class="form-control"
-							name="modal-video-urlprovider-input"
-							id="modal-video-urlprovider-input"
-							type="text" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videourlprovider-modal-submit"
-				        class="btn btn-primary modal-submit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php if (!$this->message->parent && isset($this->poll)) : ?>
-	<div id="modal-poll-not-allowed-to-edit" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="poll-not-allowed-to-edit"
-	     aria-hidden="true" data-backdrop="false" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="poll-not-allowed-to-edit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_NOT_ALLOWED_TO_EDIT') ?></h3>
-				</div>
-				<div class="modal-body">
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_NOT_ALLOWED_TO_EDIT') ?>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div id="modal-poll-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" data-backdrop="false" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_SETTINGS') ?></h3>
-				</div>
-				<div class="modal-body">
-					<div id="kbbcode-poll-options">
-						<div class="input-group col-md-12" style="padding: 0;">
-							<label class="kpoll-title-lbl"
-							       for="kpoll-title"><?php echo Text::_('COM_KUNENA_POLL_TITLE'); ?></label>
-							<input type="text" class="inputbox form-control col-md-12" name="poll_title"
-							       id="kpoll-title"
-							       maxlength="150" size="40"
-							       value="<?php echo $this->escape($this->poll->title) ?>"
-							/>
-						</div>
-						<div class="clearfix"></div>
-						<?php echo KunenaIcons::poll_add(); ?>
-						<?php echo KunenaIcons::poll_rem(); ?>
-						<div class="clearfix"></div>
-						<div id="datepoll-container">
-							<label class="kpoll-term-lbl"
-							       for="kpoll-time-to-live"><?php echo Text::_('COM_KUNENA_POLL_TIME_TO_LIVE'); ?></label>
-							<div class="input-group date">
-								<input type="text" class="form-control" id="poll_time_to_live"
-								       data-date-format="mm/dd/yyyy"
-								       value="<?php echo !empty($this->poll->polltimetolive) ? $this->poll->polltimetolive : '' ?>">
-								<span class="input-group-addon">
-								<?php echo KunenaIcons::grid(); ?>
-							</span>
-							</div>
-						</div>
-					</div>
-					<div class="clearfix"></div>
-					<br/>
-					<div id="kpoll-alert-error" class="alert alert-notice" style="display:none;">
-						<button type="button" class="close" data-dismiss="alert">&times;</button>
-						<?php echo Text::sprintf('COM_KUNENA_ALERT_WARNING_X', Text::_('COM_KUNENA_POLL_NUMBER_OPTIONS_MAX_NOW')) ?>
-					</div>
-					<?php
-					if ($this->poll->exists())
-					{
-						$x = 1;
-						foreach ($this->poll->getOptions() as $poll_option)
-						{
-							echo '<div class="polloption">Option ' . $x . ' <input type="text" class="form-control" size="100" id="field_option' . $x . ' ' . '" name="polloptionsID[' . $poll_option->id . ']" value="' . $poll_option->text . '"/></div>';
-							$x++;
-						}
-					}
-					?>
-					<input type="hidden" name="nb_options_allowed" id="nb_options_allowed"
-					       value="<?php echo $this->config->pollnboptions; ?>"/>
-					<input type="hidden" name="number_total_options" id="numbertotal"
-					       value="<?php echo !empty($this->polloptionstotal) ? $this->escape($this->polloptionstotal) : '' ?>"/>
-				</div>
-				<div class="modal-footer">
-					<button id="poll-settings-modal-submit"
-					        class="btn btn-primary"><?php echo $this->poll->exists() ? Text::_('COM_KUNENA_EDITOR_MODAL_EDIT_LABEL') : Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-default" data-dismiss="modal"
-					        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-emoticons" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel">Emoticons</h3>
-			</div>
-			<div class="modal-body">
-				<div id="smilie"><?php
-					$emoticons = KunenaHtmlParser::getEmoticons(0, 1);
-					foreach ($emoticons as $emo_code => $emo_url)
-					{
-						$data   = getimagesize(JPATH_ROOT . '/' . $emo_url);
-						$width  = $data[0];
-						$height = $data[1];
-						echo '<img class="smileyimage" src="' . $emo_url . '" border="0" width="' . $width . '" height="' . $height . '"  alt="' . $emo_code . ' " title="' . $emo_code . ' " style="cursor:pointer"/> ';
-					}
-					?>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<!-- end of Bootstrap modal to be used with bbcode editor -->
-<div class="control-group">
-	<div class="controls">
-		<input type="hidden" id="kurl_emojis" name="kurl_emojis"
-		       value="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=topic&layout=listemoji&format=raw') ?>"/>
-		<input type="hidden" id="kemojis_allowed" name="kemojis_allowed"
-		       value="<?php echo $this->config->disemoticons ?>"/>
-	</div>
-</div>
-
diff --git a/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/wysibb.php b/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/wysibb.php
deleted file mode 100644
index 69009c0e67e..00000000000
--- a/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/wysibb.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-/**
- * Kunena Component
- * @package         Kunena.Template.Crypsis
- * @subpackage      Layout.Widget
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die;
-use Joomla\CMS\Language\Text;
-
-$this->addScript('assets/js/jquery.wysibb.js');
-$this->addStyleSheet('assets/css/wbbtheme.css');
-$this->addScript('assets/js/wysibb.lang.js');
-echo $this->subLayout('Widget/Datepicker');
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BOLD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ITALIC');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_UNDERLINE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_STRIKE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LINK');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_IMAGE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUB');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYLEFT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYCENTER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYRIGHT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_TABLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BULLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_NUMLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_QUOTE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_OFFTOP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CODE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SPOILER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTCOLOR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTFAMILY');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERYSMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_SMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_NORMAL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_BIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERTBIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SMILEBOX');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIDEO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVEFORMAT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMGSRC_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_BTN');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ADD_ATTACH');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_VIDEO_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CLOSE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SAVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CANCEL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VALIDATION_ERR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ERROR_ONUPLOAD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LOADING');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_AUTO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIEWS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_DOWNLOADS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM3');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM4');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM5');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM6');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM7');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM8');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM9');
-
-$this->ktemplate  = KunenaFactory::getTemplate();
-$templatesettings = $this->ktemplate->params;
-$topictemplate    = !KunenaConfig::getInstance()->pickup_category;
-$settings         = $templatesettings->get('wysibb');
-?>
-<script>
-	var wbbOpt = {
-		lang: "kunena",
-		buttons: "<?php echo $settings;?>"
-	};
-	jQuery(function ($) {
-		$("#editor").wysibb(wbbOpt);
-	});
-</script>
-
-<div class="control-group">
-	<label class="control-label"><?php echo Text::_('COM_KUNENA_MESSAGE'); ?></label>
-	<div class="controls">
-		<textarea class="form-control" name="message" id="editor" rows="12" tabindex="7
-		          placeholder="<?php echo Text::_('COM_KUNENA_ENTER_MESSAGE') ?>"><?php if (!empty($this->message->getCategory()->topictemplate) && !$this->message->getTopic()->first_post_id && $topictemplate)
-			{
-				echo $this->message->getCategory()->topictemplate;
-			}
-			else
-			{
-				echo $this->escape($this->message->message);
-			} ?></textarea>
-	</div>
-</div>
-
-<!-- Bootstrap modal to be used with bbcode editor -->
-<div id="modal-map" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-     style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_MAP_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TYPE') ?>: <select id="modal-map-type">
-						<option value="HYBRID"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_HYBRID') ?></option>
-						<option value="ROADMAP"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ROADMAP') ?></option>
-						<option value="TERRAIN"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TERRAIN') ?></option>
-						<option value="SATELLITE"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_SATELLITE') ?></option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ZOOM_LEVEL') ?>: <select
-							id="modal-map-zoomlevel">
-						<option value="2">2</option>
-						<option value="4">4</option>
-						<option type="6">6</option>
-						<option value="8">8</option>
-						<option value="10">10</option>
-						<option value="12">12</option>
-						<option value="14">14</option>
-						<option value="16">16</option>
-						<option value="18">18</option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY') ?>: <input name="modal-map-city"
-					                                                                            id="modal-map-city"
-					                                                                            type="text"
-					                                                                            value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="map-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php $codeTypes = $this->getCodeTypes();
-if (!empty($codeTypes)) : ?>
-	<div id="modal-code" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_CODE_SETTINGS') ?></h3>
-				</div>
-				<div class="modal-body">
-					<p>
-						<?php echo $codeTypes; ?>
-					</p>
-				</div>
-				<div class="modal-footer">
-					<button id="code-modal-submit"
-					        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-default" data-dismiss="modal"
-					        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-picture" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-     style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_SIZE') ?>: <input
-							class="form-control"
-							name="modal-picture-size"
-							id="modal-picture-size" type="text"
-							value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL') ?>: <input
-							class="form-control" name="modal-picture-url"
-							id="modal-picture-url" type="text" value=""/>
-				</p>
-			</div>
-			<div class="modal-footer">
-				<button id="picture-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-link" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-     style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL') ?>: <input
-							class="form-control" name="modal-link-url"
-							id="modal-link-url" type="text" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT') ?>: <input
-							class="form-control" name="modal-link-text"
-							id="modal-link-text" type="text" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="link-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_SIZE') ?>: <input
-							class="form-control" name="modal-video-size"
-							id="modal-video-size" type="text" maxlength="5"
-							size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_WIDTH') ?>: <input
-							class="form-control" name="modal-video-width"
-							id="modal-video-width" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_HEIGHT') ?>: <input
-							class="form-control"
-							name="modal-video-height"
-							id="modal-video-height" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php
-					echo Text::_('COM_KUNENA_EDITOR_VIDEO_PROVIDER');
-					?>
-					<select id="kvideoprovider-list-modal"
-					        name="provider" class="kbutton form-control">
-						<?php
-						$vid_provider = array('', 'Bofunk', 'Break', 'Clipfish', 'DivX,divx]http://', 'Flash,flash]http://', 'FlashVars,flashvars param=]http://', 'MediaPlayer,mediaplayer]http://', 'Metacafe', 'MySpace', 'QuickTime,quicktime]http://', 'RealPlayer,realplayer]http://', 'RuTube', 'Sapo', 'Streetfire', 'Veoh', 'Videojug', 'Vimeo', 'Wideo.fr', 'YouTube');
-						foreach ($vid_provider as $vid_type)
-						{
-							$vid_type = explode(',', $vid_type);
-							echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-						}
-						?>
-					</select>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_ID') ?>: <input
-							class="form-control" name="modal-video-id"
-							id="modal-video-id" type="text" maxlength="30"
-							size="11" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videosettings-modal-submit"
-				        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-urlprovider" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER_URL') ?>: <input
-							class="form-control"
-							name="modal-video-urlprovider-input"
-							id="modal-video-urlprovider-input"
-							type="text" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videourlprovider-modal-submit"
-				        class="btn btn-primary modal-submit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php if (!$this->message->parent && isset($this->poll)) : ?>
-	<div id="modal-poll-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	     aria-hidden="true" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_SETTINGS') ?></h3>
-				</div>
-				<div class="modal-body">
-					<div id="kbbcode-poll-options">
-						<label class="kpoll-title-lbl"
-						       for="kpoll-title"><?php echo Text::_('COM_KUNENA_POLL_TITLE'); ?></label>
-						<input type="text" class="inputbox form-control" name="poll_title" id="kpoll-title"
-						       maxlength="150" size="40"
-						       value="<?php echo $this->escape($this->poll->title) ?>"
-						/>
-						<i id="kbutton-poll-add" class="glyphicon glyphicon-plus btn btn-xs btn-default"
-						   alt="<?php echo Text::_('COM_KUNENA_POLL_ADD_POLL_OPTION'); ?>"> </i>
-						<i id="kbutton-poll-rem" class="glyphicon glyphicon-minus btn btn-xs btn-default"
-						   alt="<?php echo Text::_('COM_KUNENA_POLL_REMOVE_POLL_OPTION'); ?>"> </i>
-						<br>
-						<label class="kpoll-term-lbl"
-						       for="kpoll-time-to-live"><?php echo Text::_('COM_KUNENA_POLL_TIME_TO_LIVE'); ?></label>
-						<div id="datepoll-container" class="col-md-5">
-							<div class="input-append date">
-								<input type="text" class="form-control" name="poll_time_to_live"
-								       data-date-format="mm/dd/yyyy"
-								       value="<?php echo !empty($this->poll->polltimetolive) ? $this->poll->polltimetolive : '' ?>">
-								<span class="input-group-addon">
-								<?php echo KunenaIcons::grid(); ?>
-							</span>
-							</div>
-						</div>
-						<br>
-						<div id="kpoll-alert-error" class="alert alert-notice" style="display:none;">
-							<button type="button" class="close" data-dismiss="alert">&times;</button>
-							<?php echo Text::sprintf('COM_KUNENA_ALERT_WARNING_X', Text::_('COM_KUNENA_POLL_NUMBER_OPTIONS_MAX_NOW')) ?>
-						</div>
-						<?php
-						if ($this->poll->exists())
-						{
-							$x = 1;
-							foreach ($this->poll->getOptions() as $poll_option)
-							{
-								echo '<div class="polloption">Option ' . $x . ' <input type="text" class="form-control" size="100" id="field_option' . $x . ' ' . '" name="polloptionsID[' . $poll_option->id . ']" value="' . $poll_option->text . '")" /></div>';
-								$x++;
-							}
-						}
-						?>
-						<input type="hidden" name="nb_options_allowed" id="nb_options_allowed"
-						       value="<?php echo $this->config->pollnboptions; ?>"/>
-						<input type="hidden" name="number_total_options" id="numbertotal"
-						       value="<?php echo !empty($this->polloptionstotal) ? $this->escape($this->polloptionstotal) : '' ?>"/>
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button id="poll-settings-modal-submit"
-					        class="btn btn-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-default" data-dismiss="modal"
-					        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-emoticons" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-     aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel">Emoticons</h3>
-			</div>
-			<div class="modal-body">
-				<div id="smilie"><?php
-					$emoticons = KunenaHtmlParser::getEmoticons(0, 1);
-					foreach ($emoticons as $emo_code => $emo_url)
-					{
-						echo '<img class="smileyimage" src="' . $emo_url . '" border="0" width="20" height="20" alt="' . $emo_code . ' " title="' . $emo_code . ' " style="cursor:pointer"/> ';
-					}
-					?>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button class="btn btn-default" data-dismiss="modal"
-				        aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<!-- end of Bootstrap modal to be used with bbcode editor -->
-<div class="control-group">
-	<div class="controls">
-		<input type="hidden" id="kurl_emojis" name="kurl_emojis"
-		       value="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=topic&layout=listemoji&format=raw') ?>"/>
-		<input type="hidden" id="kemojis_allowed" name="kemojis_allowed"
-		       value="<?php echo $this->config->disemoticons ?>"/>
-	</div>
-</div>
-
diff --git a/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/wysibb_quick.php b/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/wysibb_quick.php
deleted file mode 100644
index abf2869418e..00000000000
--- a/src/components/com_kunena/template/crypsisb3/layouts/widget/editor/wysibb_quick.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsis
- * @subpackage      Layout.Widget
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die();
-use Joomla\CMS\Language\Text;
-
-$this->addScript('assets/js/jquery.wysibb.js');
-$this->addStyleSheet('assets/css/wbbtheme.css');
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-$this->addScript('assets/js/wysibb.lang.js');
-
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BOLD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ITALIC');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_UNDERLINE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_STRIKE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LINK');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_IMAGE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUB');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYLEFT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYCENTER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYRIGHT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_TABLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BULLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_NUMLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_QUOTE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_OFFTOP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CODE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SPOILER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTCOLOR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTFAMILY');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERYSMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_SMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_NORMAL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_BIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERTBIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SMILEBOX');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIDEO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVEFORMAT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMGSRC_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_BTN');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ADD_ATTACH');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_VIDEO_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CLOSE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SAVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CANCEL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VALIDATION_ERR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ERROR_ONUPLOAD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LOADING');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_AUTO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIEWS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_DOWNLOADS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM3');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM4');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM5');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM6');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM7');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM8');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM9');
-
-$this->ktemplate  = KunenaFactory::getTemplate();
-$templatesettings = $this->ktemplate->params;
-$settings         = $templatesettings->get('wysibb');
-?>
-<script>
-	var wbbOpt = {
-		lang: "kunena",
-		buttons: "<?php echo $settings;?>"
-	};
-	jQuery(function ($) {
-		$('[id^=editor-]').wysibb(wbbOpt);
-	});
-</script>
-
-<textarea class="col-md-12" name="message" id="editor-<?php echo $this->message->id; ?>" rows="12" tabindex="7"></textarea>
diff --git a/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/bbcode.php b/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/bbcode.php
deleted file mode 100644
index 0423aa4b5e3..00000000000
--- a/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/bbcode.php
+++ /dev/null
@@ -1,410 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsisb4
- * @subpackage      Layout.Widget
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Language\Text;
-
-// Load caret.js always before atwho.js script and use it for autocomplete, emojiis...
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-$this->addScript('assets/js/pollcheck.js');
-
-echo $this->subLayout('Widget/Datepicker');
-
-$this->getBBcodesEnabled();
-$topictemplate = !KunenaConfig::getInstance()->pickup_category;
-?>
-<div class="row">
-	<div class="col-md-12">
-		<div class="md-form form-group">
-			<div class="controls">
-				<ul id="tabs_kunena_editor" class="nav nav-tabs">
-					<li class="nav-link active"><a href="#write"
-												   data-toggle="tab"><i
-									class="fa fa-pencil-alt"></i> <?php echo Text::_('COM_KUNENA_EDITOR_TAB_WRITE_LABEL') ?>
-						</a>
-					</li>
-					<li class="nav-link"><a href="#preview"
-											data-toggle="tab"><i
-									class="fa fa-desktop"></i> <?php echo Text::_('COM_KUNENA_PREVIEW') ?></a></li>
-				</ul>
-				<textarea class="md-textarea form-control" name="message" id="editor" rows="12" tabindex="7"
-						  placeholder="<?php echo Text::_('COM_KUNENA_ENTER_MESSAGE') ?>"><?php if (!empty($this->message->getCategory()->topictemplate) && !$this->message->getTopic()->first_post_id && $topictemplate)
-{
-								echo $this->message->getCategory()->topictemplate;
-									   }
-									   else
-{
-										   echo $this->escape($this->message->message);
-									   } ?></textarea>
-			</div>
-
-			<!-- Hidden preview placeholder -->
-			<div class="controls" id="kbbcode-preview" style="display: none;"></div>
-		</div>
-	</div>
-</div>
-<!-- Bootstrap modal to be used with bbcode editor -->
-<div id="modal-map" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-	 style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_MAP_SETTINGS') ?></h3>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TYPE') ?>: <select id="modal-map-type">
-						<option value="HYBRID"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_HYBRID') ?></option>
-						<option value="ROADMAP"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ROADMAP') ?></option>
-						<option value="TERRAIN"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TERRAIN') ?></option>
-						<option value="SATELLITE"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_SATELLITE') ?></option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ZOOM_LEVEL') ?>: <select
-							id="modal-map-zoomlevel">
-						<option value="2">2</option>
-						<option value="4">4</option>
-						<option value="6">6</option>
-						<option value="8">8</option>
-						<option value="10">10</option>
-						<option value="12">12</option>
-						<option value="14">14</option>
-						<option value="16">16</option>
-						<option value="18">18</option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY') ?>:
-					<input name="modal-map-city" id="modal-map-city"
-						   type="text" value=""
-						   placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY_DESC') ?>"/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="map-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php $codeTypes = $this->getCodeTypes();
-
-if (!empty($codeTypes))
-:
-	?>
-	<div id="modal-code" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-		 aria-hidden="true" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_CODE_SETTINGS') ?></h3>
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				</div>
-				<div class="modal-body">
-					<p>
-						<?php echo $codeTypes; ?>
-					</p>
-				</div>
-				<div class="modal-footer">
-					<button id="code-modal-submit"
-							class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-outline-primary border" data-dismiss="modal"
-							aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-picture" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-	 style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS') ?></h3>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_SIZE') ?>:
-					<select id="kpicture-size-list-modal"
-							name="modal-picture-size" class="kbutton">
-						<?php
-						$vid_provider = ['', '20', '40', '80', '100', '150', '200', '250', '500', '1000'];
-
-						foreach ($vid_provider as $vid_type)
-{
-							$vid_type = explode(',', $vid_type);
-							echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-						}
-						?>
-					</select>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_ALT') ?>: <input
-							class="form-control" name="modal-picture-alt"
-							id="modal-picture-alt" type="text" value=""
-							placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_ALT_PLACEHOLDER') ?>"/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL') ?>: <input
-							name="modal-picture-url"
-							id="modal-picture-url" type="text" value=""
-							placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL_PLACEHOLDER') ?>"/>
-				</p>
-			</div>
-			<div class="modal-footer">
-				<button id="picture-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-link" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-	 style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS') ?></h3>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			</div>
-			<div class="modal-body">
-				<p>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL') ?>:
-					<input name="modal-link-url" id="modal-link-url" type="text" value=""
-						   placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL_PLACEHOLDER') ?>"/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT') ?>:
-					<input name="modal-link-text" id="modal-link-text" type="text" value=""
-						   placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT_PLACEHOLDER') ?>"/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_CLASS') ?>:
-					<input name="modal-link-class" id="modal-link-class" type="text" value=""
-					       placeholder="<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_CLASS_PLACEHOLDER') ?>"/>
-				</p>
-			</div>
-			<div class="modal-footer">
-				<button id="link-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	 aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_SETTINGS') ?></h3>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_SIZE') ?>: <input
-							class="form-control" name="modal-video-size"
-							id="modal-video-size" type="text" maxlength="5"
-							size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_WIDTH') ?>: <input
-							class="form-control" name="modal-video-width"
-							id="modal-video-width" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_HEIGHT') ?>: <input
-							class="form-control"
-							name="modal-video-height"
-							id="modal-video-height" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php
-					echo Text::_('COM_KUNENA_EDITOR_VIDEO_PROVIDER');
-					?>
-					<select id="kvideoprovider-list-modal"
-							name="provider" class="kbutton form-control">
-						<?php
-						$vid_provider = ['', 'Bofunk', 'Break', 'Clipfish', 'DivX,divx]http://', 'Flash,flash]http://', 'FlashVars,flashvars param=]http://', 'MediaPlayer,mediaplayer]http://', 'Metacafe', 'MySpace', 'QuickTime,quicktime]http://', 'RealPlayer,realplayer]http://', 'RuTube', 'Sapo', 'Streetfire', 'Veoh', 'Videojug', 'Vimeo', 'Wideo.fr', 'YouTube'];
-
-						foreach ($vid_provider as $vid_type)
-{
-							$vid_type = explode(',', $vid_type);
-							echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-						}
-						?>
-					</select>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_ID') ?>: <input
-							class="form-control" name="modal-video-id"
-							id="modal-video-id" type="text" maxlength="30"
-							size="11" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videosettings-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-urlprovider" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	 aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h3 class="modal-title"><?php echo Text::_('COM_KUNENA_EDITOR_VIDEO') ?></h3>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER_URL') ?>: <input
-						class="form-control"
-						name="modal-video-urlprovider-input"
-						id="modal-video-urlprovider-input"
-						type="text" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videourlprovider-modal-submit"
-						class="btn btn-outline-primary modal-submit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php if (!$this->message->parent && isset($this->poll))
-:
-	?>
-	<div id="modal-poll-not-allowed-to-edit" class="modal fade" tabindex="-1" role="dialog"
-		 aria-labelledby="poll-not-allowed-to-edit"
-		 aria-hidden="true" data-backdrop="false" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h3 id="poll-not-allowed-to-edit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_NOT_ALLOWED_TO_EDIT') ?></h3>
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				</div>
-				<div class="modal-body">
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_NOT_ALLOWED_TO_EDIT') ?>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<div id="modal-poll-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-		 aria-hidden="true" data-backdrop="false" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_SETTINGS') ?></h3>
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				</div>
-				<div class="modal-body">
-					<div id="kbbcode-poll-options">
-						<div class="input-group col-md-12" style="padding: 0;">
-							<label class="kpoll-title-lbl"
-								   for="kpoll-title"><?php echo Text::_('COM_KUNENA_POLL_TITLE'); ?></label>
-							<input type="text" class="inputbox form-control col-md-12" name="poll_title"
-								   id="kpoll-title"
-								   maxlength="150" size="40"
-								   value="<?php echo $this->escape($this->poll->title) ?>"
-							/>
-						</div>
-						<div class="clearfix"></div>
-						<?php echo KunenaIcons::poll_add(); ?>
-						<?php echo KunenaIcons::poll_rem(); ?>
-						<div class="clearfix"></div>
-						<div id="datepoll-container">
-							<label class="kpoll-term-lbl"
-								   for="kpoll-time-to-live"><?php echo Text::_('COM_KUNENA_POLL_TIME_TO_LIVE'); ?></label>
-							<div class="input-group date">
-								<input type="text" class="form-control" id="poll_time_to_live"
-									   data-date-format="mm/dd/yyyy"
-									   value="<?php echo !empty($this->poll->polltimetolive) ? $this->poll->polltimetolive : '' ?>">
-								<span class="input-group-addon">
-								<?php echo KunenaIcons::grid(); ?>
-							</span>
-							</div>
-						</div>
-					</div>
-					<div class="clearfix"></div>
-					<br/>
-					<div id="kpoll-alert-error" class="alert alert-notice" style="display:none;">
-						<button type="button" class="close" data-dismiss="alert">&times;</button>
-						<?php echo Text::sprintf('COM_KUNENA_ALERT_WARNING_X', Text::_('COM_KUNENA_POLL_NUMBER_OPTIONS_MAX_NOW')) ?>
-					</div>
-					<?php
-					if ($this->poll->exists())
-	{
-						$x = 1;
-
-						foreach ($this->poll->getOptions() as $poll_option)
-		{
-							echo '<div class="polloption">Option ' . $x . ' <input type="text" class="form-control" size="100" id="field_option' . $x . ' ' . '" name="polloptionsID[' . $poll_option->id . ']" value="' . $poll_option->text . '"/></div>';
-							$x++;
-						}
-					}
-					?>
-					<input type="hidden" name="nb_options_allowed" id="nb_options_allowed"
-						   value="<?php echo $this->config->pollnboptions; ?>"/>
-					<input type="hidden" name="number_total_options" id="numbertotal"
-						   value="<?php echo !empty($this->polloptionstotal) ? $this->escape($this->polloptionstotal) : '' ?>"/>
-				</div>
-				<div class="modal-footer">
-					<button id="poll-settings-modal-submit"
-							class="btn btn-outline-primary"><?php echo $this->poll->exists() ? Text::_('COM_KUNENA_EDITOR_MODAL_EDIT_LABEL') : Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-outline-primary border" data-dismiss="modal"
-							aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-
-<div id="modal-emoticons" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	 aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h3 class="modal-title">Emoticons</h3>
-				<button type="button" class="close" data-dismiss="modal" aria-label="Close">
-					<span aria-hidden="true">&times;</span>
-				</button>
-			</div>
-			<div class="modal-body">
-				<div id="smilie"><?php
-					$emoticons = KunenaHtmlParser::getEmoticons(0, 1);
-
-				foreach ($emoticons as $emo_code => $emo_properties)
-{
-					if ($emo_properties->type == 'svg')
-	{
-						echo '<img src="' . $emo_properties->path . '" width="32" height="32"/>';
-					}
-					else
-	{
-						echo '<img class="smileyimage" src="' . $emo_properties->path . '" border="0" width="' . $emo_properties->width . '" height="' . $emo_properties->height . '"  alt="' . $emo_code . ' " title="' . $emo_code . ' " style="cursor:pointer"/> ';
-					}
-				}
-				?>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-
-<!-- end of Bootstrap modal to be used with bbcode editor -->
-<div class="control-group">
-	<div class="controls">
-		<input type="hidden" id="kurl_emojis" name="kurl_emojis"
-			   value="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=topic&layout=listemoji&format=raw') ?>"/>
-		<input type="hidden" id="kemojis_allowed" name="kemojis_allowed"
-			   value="<?php echo $this->config->disemoticons ?>"/>
-	</div>
-</div>
-
diff --git a/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/wysibb.php b/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/wysibb.php
deleted file mode 100644
index 0640cc052bd..00000000000
--- a/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/wysibb.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsisb4
- * @subpackage      Layout.Widget
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Language\Text;
-
-$this->addScript('assets/js/jquery.wysibb.js');
-$this->addStyleSheet('assets/css/wbbtheme.css');
-$this->addScript('assets/js/wysibb.lang.js');
-echo $this->subLayout('Widget/Datepicker');
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-$this->addScript('assets/js/pollcheck.js');
-
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BOLD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ITALIC');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_UNDERLINE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_STRIKE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LINK');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_IMAGE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUB');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYLEFT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYCENTER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYRIGHT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_TABLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BULLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_NUMLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_QUOTE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_OFFTOP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CODE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SPOILER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTCOLOR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTFAMILY');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERYSMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_SMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_NORMAL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_BIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERTBIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SMILEBOX');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIDEO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVEFORMAT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMGSRC_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_BTN');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ADD_ATTACH');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_VIDEO_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CLOSE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SAVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CANCEL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VALIDATION_ERR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ERROR_ONUPLOAD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LOADING');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_AUTO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIEWS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_DOWNLOADS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM3');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM4');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM5');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM6');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM7');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM8');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM9');
-
-$this->ktemplate  = KunenaFactory::getTemplate();
-$templatesettings = $this->ktemplate->params;
-$topictemplate    = !KunenaConfig::getInstance()->pickup_category;
-$settings         = $templatesettings->get('wysibb');
-?>
-<script>
-	var wbbOpt = {
-		lang: "kunena",
-		buttons: "<?php echo $settings;?>"
-	};
-	jQuery(function ($) {
-		$("#editor").wysibb(wbbOpt);
-	});
-</script>
-
-<div class="control-group">
-	<label class="control-label"><?php echo Text::_('COM_KUNENA_MESSAGE'); ?></label>
-	<div class="controls">
-		<textarea class="form-control" name="message" id="editor" rows="12" tabindex="7"
-				  placeholder="<?php echo Text::_('COM_KUNENA_ENTER_MESSAGE') ?>"><?php if (!empty($this->message->getCategory()->topictemplate) && !$this->message->getTopic()->first_post_id && $topictemplate)
-					{
-						echo $this->message->getCategory()->topictemplate;
-							   }
-							   else
-							   {
-								   echo $this->escape($this->message->message);
-							   } ?></textarea>
-	</div>
-</div>
-
-<!-- Bootstrap modal to be used with bbcode editor -->
-<div id="modal-map" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-	 style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_MAP_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TYPE') ?>: <select id="modal-map-type">
-						<option value="HYBRID"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_HYBRID') ?></option>
-						<option value="ROADMAP"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ROADMAP') ?></option>
-						<option value="TERRAIN"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_TERRAIN') ?></option>
-						<option value="SATELLITE"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_SATELLITE') ?></option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_ZOOM_LEVEL') ?>: <select
-							id="modal-map-zoomlevel">
-						<option value="2">2</option>
-						<option value="4">4</option>
-						<option type="6">6</option>
-						<option value="8">8</option>
-						<option value="10">10</option>
-						<option value="12">12</option>
-						<option value="14">14</option>
-						<option value="16">16</option>
-						<option value="18">18</option>
-					</select><br/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_MAP_SETTINGS_CITY') ?>: <input name="modal-map-city"
-																							   id="modal-map-city"
-																							   type="text"
-																							   value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="map-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php $codeTypes = $this->getCodeTypes();
-
-if (!empty($codeTypes))
-:
-	?>
-	<div id="modal-code" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-		 aria-hidden="true" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_CODE_SETTINGS') ?></h3>
-				</div>
-				<div class="modal-body">
-					<p>
-						<?php echo $codeTypes; ?>
-					</p>
-				</div>
-				<div class="modal-footer">
-					<button id="code-modal-submit"
-							class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-outline-primary border" data-dismiss="modal"
-							aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-picture" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-	 style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_SIZE') ?>: <input
-							class="form-control"
-							name="modal-picture-size"
-							id="modal-picture-size" type="text"
-							value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_PICTURE_SETTINGS_URL') ?>: <input
-							class="form-control" name="modal-picture-url"
-							id="modal-picture-url" type="text" value=""/>
-				</p>
-			</div>
-			<div class="modal-footer">
-				<button id="picture-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-link" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
-	 style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_URL') ?>: <input
-							class="form-control" name="modal-link-url"
-							id="modal-link-url" type="text" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_TEXT') ?>: <input
-							class="form-control" name="modal-link-text"
-							id="modal-link-text" type="text" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="link-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	 aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_SETTINGS') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_SIZE') ?>: <input
-							class="form-control" name="modal-video-size"
-							id="modal-video-size" type="text" maxlength="5"
-							size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_WIDTH') ?>: <input
-							class="form-control" name="modal-video-width"
-							id="modal-video-width" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_HEIGHT') ?>: <input
-							class="form-control"
-							name="modal-video-height"
-							id="modal-video-height" type="text"
-							maxlength="5" size="5" value=""/>
-					<?php
-					echo Text::_('COM_KUNENA_EDITOR_VIDEO_PROVIDER');
-					?>
-					<select id="kvideoprovider-list-modal"
-							name="provider" class="kbutton form-control">
-						<?php
-						$vid_provider = ['', 'Bofunk', 'Break', 'Clipfish', 'DivX,divx]http://', 'Flash,flash]http://', 'FlashVars,flashvars param=]http://', 'MediaPlayer,mediaplayer]http://', 'Metacafe', 'MySpace', 'QuickTime,quicktime]http://', 'RealPlayer,realplayer]http://', 'RuTube', 'Sapo', 'Streetfire', 'Veoh', 'Videojug', 'Vimeo', 'Wideo.fr', 'YouTube'];
-
-						foreach ($vid_provider as $vid_type)
-						{
-							$vid_type = explode(',', $vid_type);
-							echo '<option value = "' . (!empty($vid_type [1]) ? $this->escape($vid_type [1]) : Joomla\String\StringHelper::strtolower($this->escape($vid_type [0])) . '') . '">' . $this->escape($vid_type [0]) . '</option>';
-						}
-						?>
-					</select>
-					<?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_LINK_SETTINGS_ID') ?>: <input
-							class="form-control" name="modal-video-id"
-							id="modal-video-id" type="text" maxlength="30"
-							size="11" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videosettings-modal-submit"
-						class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<div id="modal-video-urlprovider" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	 aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER') ?></h3>
-			</div>
-			<div class="modal-body">
-				<p><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_VIDEO_URL_PROVIDER_URL') ?>: <input
-							class="form-control"
-							name="modal-video-urlprovider-input"
-							id="modal-video-urlprovider-input"
-							type="text" value=""/></p>
-			</div>
-			<div class="modal-footer">
-				<button id="videourlprovider-modal-submit"
-						class="btn btn-outline-primary modal-submit"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<?php if (!$this->message->parent && isset($this->poll))
-:
-	?>
-	<div id="modal-poll-settings" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-		 aria-hidden="true" style="display: none;">
-		<div class="modal-dialog" role="document">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-					<h3 id="myModalLabel"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_TITLE_POLL_SETTINGS') ?></h3>
-				</div>
-				<div class="modal-body">
-					<div id="kbbcode-poll-options">
-						<label class="kpoll-title-lbl"
-							   for="kpoll-title"><?php echo Text::_('COM_KUNENA_POLL_TITLE'); ?></label>
-						<input type="text" class="inputbox form-control" name="poll_title" id="kpoll-title"
-							   maxlength="150" size="40"
-							   value="<?php echo $this->escape($this->poll->title) ?>"
-						/>
-						<i id="kbutton-poll-add" class="glyphicon glyphicon-plus btn btn-xs btn-default"
-						   alt="<?php echo Text::_('COM_KUNENA_POLL_ADD_POLL_OPTION'); ?>"> </i>
-						<i id="kbutton-poll-rem" class="glyphicon glyphicon-minus btn btn-xs btn-default"
-						   alt="<?php echo Text::_('COM_KUNENA_POLL_REMOVE_POLL_OPTION'); ?>"> </i>
-						<br>
-						<label class="kpoll-term-lbl"
-							   for="kpoll-time-to-live"><?php echo Text::_('COM_KUNENA_POLL_TIME_TO_LIVE'); ?></label>
-						<div id="datepoll-container" class="col-md-5">
-							<div class="input-append date">
-								<input type="text" class="form-control" name="poll_time_to_live"
-									   data-date-format="mm/dd/yyyy"
-									   value="<?php echo !empty($this->poll->polltimetolive) ? $this->poll->polltimetolive : '' ?>">
-								<span class="input-group-addon">
-								<?php echo KunenaIcons::grid(); ?>
-							</span>
-							</div>
-						</div>
-						<br>
-						<div id="kpoll-alert-error" class="alert alert-notice" style="display:none;">
-							<button type="button" class="close" data-dismiss="alert">&times;</button>
-							<?php echo Text::sprintf('COM_KUNENA_ALERT_WARNING_X', Text::_('COM_KUNENA_POLL_NUMBER_OPTIONS_MAX_NOW')) ?>
-						</div>
-						<?php
-						if ($this->poll->exists())
-						{
-							$x = 1;
-
-							foreach ($this->poll->getOptions() as $poll_option)
-							{
-								echo '<div class="polloption">Option ' . $x . ' <input type="text" class="form-control" size="100" id="field_option' . $x . ' ' . '" name="polloptionsID[' . $poll_option->id . ']" value="' . $poll_option->text . '")" /></div>';
-								$x++;
-							}
-						}
-						?>
-						<input type="hidden" name="nb_options_allowed" id="nb_options_allowed"
-							   value="<?php echo $this->config->pollnboptions; ?>"/>
-						<input type="hidden" name="number_total_options" id="numbertotal"
-							   value="<?php echo !empty($this->polloptionstotal) ? $this->escape($this->polloptionstotal) : '' ?>"/>
-					</div>
-				</div>
-				<div class="modal-footer">
-					<button id="poll-settings-modal-submit"
-							class="btn btn-outline-primary"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_ADD_LABEL') ?></button>
-					<button class="btn btn-outline-primary border" data-dismiss="modal"
-							aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-				</div>
-			</div>
-		</div>
-	</div>
-<?php endif; ?>
-<div id="modal-emoticons" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-	 aria-hidden="true" style="display: none;">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-				<h3 id="myModalLabel">Emoticons</h3>
-			</div>
-			<div class="modal-body">
-				<div id="smilie"><?php
-					$emoticons = KunenaHtmlParser::getEmoticons(0, 1);
-
-				foreach ($emoticons as $emo_code => $emo_properties)
-				{
-					echo '<img class="smileyimage" src="' . $emo_properties->path . '" border="0" width="' . $emo_properties->width . '" height="' . $emo_properties->height . '"  alt="' . $emo_code . ' " title="' . $emo_code . ' " style="cursor:pointer"/> ';
-				}
-				?>
-				</div>
-			</div>
-			<div class="modal-footer">
-				<button class="btn btn-outline-primary border" data-dismiss="modal"
-						aria-hidden="true"><?php echo Text::_('COM_KUNENA_EDITOR_MODAL_CLOSE_LABEL') ?></button>
-			</div>
-		</div>
-	</div>
-</div>
-<!-- end of Bootstrap modal to be used with bbcode editor -->
-<div class="control-group">
-	<div class="controls">
-		<input type="hidden" id="kurl_emojis" name="kurl_emojis"
-			   value="<?php echo KunenaRoute::_('index.php?option=com_kunena&view=topic&layout=listemoji&format=raw') ?>"/>
-		<input type="hidden" id="kemojis_allowed" name="kemojis_allowed"
-			   value="<?php echo $this->config->disemoticons ?>"/>
-	</div>
-</div>
-
diff --git a/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/wysibb_quick.php b/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/wysibb_quick.php
deleted file mode 100644
index 8b0ba6dde9e..00000000000
--- a/src/components/com_kunena/template/crypsisb4/layouts/widget/editor/wysibb_quick.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * Kunena Component
- *
- * @package         Kunena.Template.Crypsisb4
- * @subpackage      Layout.Widget
- *
- * @copyright       Copyright (C) 2008 - 2020 Kunena Team. All rights reserved.
- * @license         https://www.gnu.org/copyleft/gpl.html GNU/GPL
- * @link            https://www.kunena.org
- **/
-defined('_JEXEC') or die();
-
-use Joomla\CMS\Language\Text;
-
-$this->addScript('assets/js/jquery.wysibb.js');
-$this->addStyleSheet('assets/css/wbbtheme.css');
-$this->addScript('jquery.caret.js');
-$this->addScript('jquery.atwho.js');
-$this->addStyleSheet('jquery.atwho.css');
-$this->addScript('assets/js/wysibb.lang.js');
-
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BOLD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ITALIC');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_UNDERLINE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_STRIKE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LINK');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_IMAGE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SUB');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYLEFT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYCENTER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_JUSTIFYRIGHT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_TABLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_BULLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_NUMLIST');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_QUOTE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_OFFTOP');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CODE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SPOILER');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTCOLOR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTFAMILY');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERYSMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_SMALL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_NORMAL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_BIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FONTSIZE_VERTBIG');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SMILEBOX');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIDEO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVEFORMAT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_EMAIL_URL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_LINK_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TITLE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_TAB2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMGSRC_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_IMG_BTN');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ADD_ATTACH');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_MODAL_VIDEO_TEXT');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CLOSE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SAVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_CANCEL');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_REMOVE');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VALIDATION_ERR');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_ERROR_ONUPLOAD');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_FILEUPLOAD_TEXT2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_LOADING');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_AUTO');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_VIEWS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_DOWNLOADS');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM1');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM2');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM3');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM4');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM5');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM6');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM7');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM8');
-Text::script('COM_KUNENA_WYSIBB_EDITOR_SM9');
-
-$this->ktemplate  = KunenaFactory::getTemplate();
-$templatesettings = $this->ktemplate->params;
-$settings         = $templatesettings->get('wysibb');
-?>
-<script>
-	var wbbOpt = {
-		lang: "kunena",
-		buttons: "<?php echo $settings;?>"
-	};
-	jQuery(function ($) {
-		$('[id^=editor-]').wysibb(wbbOpt);
-	});
-</script>
-
-<textarea class="col-md-12" name="message" id="editor-<?php echo $this->message->id; ?>" rows="12" tabindex="7"
-		  ></textarea>
diff --git a/src/media/kunena/core/js/plugins/map/dialogs/map.js b/src/media/kunena/core/js/plugins/map/dialogs/map.js
index 123cac2b743..f2d034a8ee8 100644
--- a/src/media/kunena/core/js/plugins/map/dialogs/map.js
+++ b/src/media/kunena/core/js/plugins/map/dialogs/map.js
@@ -36,7 +36,6 @@ CKEDITOR.dialog.add( 'mapDialog', function( editor ) {
     'default': '10',
     onChange: function( api ) {
         // this = CKEDITOR.ui.dialog.select
-        alert( 'Current value: ' + this.getValue() );
     }
 },
 {
diff --git a/src/media/kunena/core/js/plugins/video/dialogs/video.js b/src/media/kunena/core/js/plugins/video/dialogs/video.js
index 127100e5484..08fd290e90b 100644
--- a/src/media/kunena/core/js/plugins/video/dialogs/video.js
+++ b/src/media/kunena/core/js/plugins/video/dialogs/video.js
@@ -42,10 +42,16 @@ CKEDITOR.dialog.add( 'videoDialog', function( editor ) {
 		default: ''
 	},
 	{
-		type: 'text',
+		type: 'select',
 		id: 'provider',
-		label: 'Provider',
-		default: ''
+		label: 'Select a video provider',
+		items: [ [ '' ], [ 'Bofunk' ], [ 'Break' ], [ 'Clipfish' ], [ 'DivX,divx]http://' ], [ 'Flash,flash]http://' ], [ 'FlashVars,flashvars param=]http://' ], 
+		[ 'MediaPlayer,mediaplayer]http://' ], [ 'Metacafe' ], [ 'MySpace' ], [ 'QuickTime,quicktime]http://' ], [ 'RealPlayer,realplayer]http://' ], [ 'RuTube' ], [ 'Sapo' ]
+		, [ 'Streetfire' ], [ 'Veoh' ], [ 'Videojug' ], [ 'Vimeo' ], [ 'Wideo.fr' ], [ 'YouTube' ] ],
+		'default': '',
+		onChange: function( api ) {
+			// this = CKEDITOR.ui.dialog.select
+		}
 	},
 	{
 		type: 'text',