diff --git a/main/exercise/matching.class.php b/main/exercise/matching.class.php
index e3293af215..3549bfb42c 100755
--- a/main/exercise/matching.class.php
+++ b/main/exercise/matching.class.php
@@ -148,7 +148,6 @@ class Matching extends Question
 
             $form->addHtml('<tr>');
             $form->addHtml("<td>$i</td>");
-            //$form->addText("answer[$i]", null);
             $form->addHtmlEditor(
                 "answer[$i]",
                 null,
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
index 325fb80313..caff9619f3 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
@@ -224,7 +224,7 @@ class Basic extends Toolbar
      */
     public function getNewPageBlock()
     {
-        return  ['NewPage', 'Templates', '-', 'PasteFromWord', 'inserthtml'];
+        return ['NewPage', 'Templates', '-', 'PasteFromWord', 'inserthtml'];
     }
 
     /**
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
index 173b3f2a7d..8ce6a3860c 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestMatching.php
@@ -1,12 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * TestFreeAnswer toolbar configuration.
- *
- * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestMatching extends Basic
 {
@@ -17,7 +16,7 @@ class TestMatching extends Basic
      */
     public function getConfig()
     {
-        if (api_get_setting('more_buttons_maximized_mode') != 'true') {
+        if (api_get_setting('more_buttons_maximized_mode') !== 'true') {
             $config['toolbar'] = $this->getNormalToolbar();
         } else {
             $config['toolbar_minToolbar'] = $this->getMinimizedToolbar();
@@ -25,7 +24,7 @@ class TestMatching extends Basic
         }
 
         $config['fullPage'] = false;
-        $config['extraPlugins'] = 'wordcount';
+        $config['extraPlugins'] = $this->getPluginsToString();
         $config['wordcount'] = [
             // Whether or not you want to show the Word Count
             'showWordCount' => true,
@@ -37,8 +36,6 @@ class TestMatching extends Basic
             'wordLimit' => 'unlimited',
         ];
 
-        //$config['height'] = '200';
-
         return $config;
     }
 
@@ -73,7 +70,7 @@ class TestMatching extends Basic
             ['BulletedList', 'NumberedList', 'HorizontalRule', '-', 'Outdent', 'Indent', 'Blockquote'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             ['Bold', 'Italic', 'Underline', 'Strike', '-', 'Subscript', 'Superscript', '-', 'TextColor', 'BGColor'],
-            [api_get_setting('allow_spellcheck') == 'true' ? 'Scayt' : ''],
+            [api_get_setting('allow_spellcheck') === 'true' ? 'Scayt' : ''],
             ['Styles', 'Format', 'Font', 'FontSize'],
             ['PageBreak', 'ShowBlocks'],
             ['Toolbarswitch'],
@@ -92,6 +89,7 @@ class TestMatching extends Basic
                 'Maximize',
                 'Bold',
                 'Image',
+                'Video',
                 'Link',
                 'PasteFromWord',
                 'Audio',
@@ -111,9 +109,20 @@ class TestMatching extends Basic
     protected function getMinimizedToolbar()
     {
         return [
-            $this->getNewPageBlock(),
+            ['PasteFromWord'],
             ['Undo', 'Redo'],
-            ['Link', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath'],
+            [
+                'Link',
+                'Image',
+                'Video',
+                'Flash',
+                'Oembed',
+                'Youtube',
+                'VimeoEmbed',
+                'Audio',
+                'Table',
+                'Asciimath',
+            ],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight'],
             ['Format', 'Font', 'FontSize', 'Bold', 'Italic', 'Underline', 'TextColor', 'BGColor'],
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestProposedAnswer.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestProposedAnswer.php
index 1ad221b357..162b6fba0a 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestProposedAnswer.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestProposedAnswer.php
@@ -1,12 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * TestProposedAnswer toolbar configuration.
- *
- * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestProposedAnswer extends Basic
 {
@@ -19,11 +18,10 @@ class TestProposedAnswer extends Basic
     {
         $config['toolbarCanCollapse'] = true;
         $config['toolbarStartupExpanded'] = false;
-        if (api_get_setting('more_buttons_maximized_mode') != 'true') {
+        if (api_get_setting('more_buttons_maximized_mode') !== 'true') {
             $config['toolbar'] = $this->getNormalToolbar();
         } else {
             $config['toolbar_minToolbar'] = $this->getMinimizedToolbar();
-
             $config['toolbar_maxToolbar'] = $this->getMaximizedToolbar();
         }
 
@@ -50,8 +48,13 @@ class TestProposedAnswer extends Basic
         return [
             ['Bold', 'Subscript', 'Superscript'],
             [
-                'Image',
                 'Link',
+                'Image',
+                'Video',
+                //'Flash',
+                'Oembed',
+                //'Youtube',
+                'VimeoEmbed',
                 'Audio',
                 'Table',
                 'PasteFromWord',
diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
index 19fbb8798c..e7a91ea17c 100644
--- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
+++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/TestQuestionDescription.php
@@ -1,12 +1,11 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar;
 
 /**
  * TestQuestionDescription toolbar configuration.
- *
- * @package Chamilo\CoreBundle\Component\Editor\CkEditor\Toolbar
  */
 class TestQuestionDescription extends Basic
 {
@@ -21,7 +20,6 @@ class TestQuestionDescription extends Basic
             ['name' => 'document', 'groups' => ['document', 'doctools']],
             ['name' => 'clipboard', 'groups' => ['clipboard', 'undo']],
             ['name' => 'editing', 'groups' => ['clipboard', 'undo']],
-            //array('name' => 'forms',    'groups' =>array('clipboard', 'undo', )),
             '/',
             ['name' => 'basicstyles', 'groups' => ['basicstyles', 'cleanup']],
             ['name' => 'paragraph', 'groups' => ['list', 'indent', 'blocks', 'align']],
@@ -152,7 +150,20 @@ class TestQuestionDescription extends Basic
         return [
             $this->getNewPageBlock(),
             ['Undo', 'Redo'],
-            ['Link', 'Unlink', 'Image', 'Video', 'Flash', 'Audio', 'Table', 'Asciimath', 'Asciisvg'],
+            [
+                'Link',
+                'Unlink',
+                'Image',
+                'Video',
+                'Flash',
+                'Oembed',
+                'Youtube',
+                'VimeoEmbed',
+                'Audio',
+                'Table',
+                'Asciimath',
+                'Asciisvg',
+            ],
             ['BulletedList', 'NumberedList', 'HorizontalRule'],
             ['JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock'],
             [