diff --git a/ckeditor-141/ckeditor.ckeditor.inc b/ckeditor/ckeditor.ckeditor.inc
index 572ae5b..c978038 100644
--- a/ckeditor-141/ckeditor.ckeditor.inc
+++ b/ckeditor/ckeditor.ckeditor.inc
@@ -55,61 +55,78 @@ function ckeditor_ckeditor_plugin() {
     if (preg_match("/\/(standard|full)-all/", $_editor_url)) {
       $plugins['tableresize'] = array(
         'name' => 'tableresize',
-        'desc' => t('Table Resize plugin. See !link for more details.', array(
-          '!link' => l(t('addon page'), 'http://ckeditor.com/addon/tableresize')
-        )),
+        'desc' => t('Table Resize plugin. See <a href="@ckdocs-tableresize">addon page</a> for more details.',
+          array('@ckdocs-tableresize' => 'http://ckeditor.com/addon/tableresize')
+        ),
         'path' => $_editor_url . '/plugins/tableresize/',
         'buttons' => FALSE,
         'default' => 't'
       );
       $plugins['autogrow'] = array(
         'name' => 'autogrow',
-        'desc' => t('Auto Grow plugin. See !link for more details.', array(
-          '!link' => l(t('addon page'), 'http://ckeditor.com/addon/autogrow')
-        )),
+        'desc' => t('Auto Grow plugin. See <a href="@ckdocs-autogrow">addon page</a> for more details.',
+          array('@ckdocs-autogrow' => 'http://ckeditor.com/addon/autogrow')
+        ),
         'path' => $_editor_url . '/plugins/autogrow/',
         'buttons' => FALSE,
         'default' => 'f'
       );
       $plugins['stylesheetparser'] = array(
         'name' => 'stylesheetparser',
-        'desc' => t('Stylesheet Parser plugin. See !link for more details.', array(
-          '!link' => l(t('addon page'), 'http://ckeditor.com/addon/stylesheetparser')
-        )),
+        'desc' => t('Stylesheet Parser plugin. See <a href="@ckdocs-stylesheetparser">addon page</a> for more details.',
+          array('@ckdocs-stylesheetparser' => 'http://ckeditor.com/addon/stylesheetparser')
+        ),
         'path' => $_editor_url . '/plugins/stylesheetparser/',
         'buttons' => FALSE,
         'default' => 'f'
       );
       $plugins['codesnippet'] = array(
         'name' => 'codesnippet',
-        'desc' => t('Plugin for inserting Code Snippets. See !link for more details. See !help for additional instructions.', array(
-          '!link' => l(t('addon page'), 'http://ckeditor.com/addon/codesnippet'),
-          '!help' => l(t('help'), 'admin/help/ckeditor', array('fragment' => 'codesnippet'))
-        )),
+        'desc' => t('Plugin for inserting Code Snippets. See <a href="@ckdocs-codesnippet">addon page</a> for more details. See <a href="@ckdocs-codesnippet-help">help</a> for additional instructions.',
+          array(
+            '@ckdocs-codesnippet' => 'http://ckeditor.com/addon/codesnippet',
+            '@ckdocs-codesnippet-help' => url('admin/help/ckeditor', array('fragment' => 'codesnippet')),
+          )
+        ),
         'path' => $_editor_url . '/plugins/codesnippet/',
         'buttons' => array(
           'CodeSnippet' => array(
             'icon' => 'icons/codesnippet.png',
-            'label' => 'Insert Code Snippet',
+            'label' => t('Insert Code Snippet'),
           )
         ),
         'default' => 'f'
       );
       $plugins['mathjax'] = array(
         'name' => 'mathjax',
-        'desc' => t('Plugin for inserting Mathematical Formula (MathJax). See !link for more details. See !help for additional instructions.', array(
-          '!link' => l(t('addon page'), 'http://ckeditor.com/addon/mathjax'),
-          '!help' => l(t('help'), 'admin/help/ckeditor', array('fragment' => 'mathjax'))
+        'desc' => t('Plugin for inserting Mathematical Formula (MathJax). See <a href="@ckdocs-mathjax">addon page</a> for more details. See <a href="@ckdocs-mathjax-help">help</a> for additional instructions.',
+          array(
+            '@ckdocs-mathjax' => 'http://ckeditor.com/addon/mathjax',
+            '@ckdocs-mathjax-help' => url('admin/help/ckeditor', array('fragment' => 'mathjax')),
         )),
         'path' => $_editor_url . '/plugins/mathjax/',
         'buttons' => array(
           'Mathjax' => array(
             'icon' => 'icons/mathjax.png',
-            'label' => 'Insert Mathematical Formulas',
+            'label' => t('Insert Mathematical Formulas'),
           )
         ),
         'default' => 'f'
       );
+      $plugins['image2'] = array(
+        'name' => 'image2',
+        'desc' => t('Enhanced Image plugin. See <a href="@ckdocs-image2">addon page</a> for more details.',
+          array('@ckdocs-image2' => 'http://ckeditor.com/addon/image2')
+        ),
+        'path' => $_editor_url . '/plugins/image2/',
+        'buttons' => array(
+          'Enhanced Image' => array(
+            'icon' => 'icons/image.png',
+            'label' => t('Insert Enhanced Image'),
+          )
+        ),
+        'default' => 't'
+      );
     }
   }
 
@@ -135,7 +152,7 @@ function ckeditor_ckeditor_plugin() {
         if (preg_match('#@file ([^\n\r]*)#', $source, $matches)) {
           $plugins[$file] = array(
             'name' => $file,
-            'desc' => t($matches[1]),
+            'desc' => check_plain($matches[1]),
             'path' => $plugin_dir . $file . '/',
             'buttons' => (count($buttons) > 0) ? $buttons : FALSE,
             'default' => 'f'
@@ -144,7 +161,7 @@ function ckeditor_ckeditor_plugin() {
         else {
           $plugins[$file] = array(
             'name' => $file,
-            'desc' => t('Plugin file: ' . $file),
+            'desc' => t('Plugin file: @plugin_filename', array('@plugin_filename' => $file)),
             'path' => $plugin_dir . $file . '/',
             'buttons' => (count($buttons) > 0) ? $buttons : FALSE,
             'default' => 'f'
@@ -177,7 +194,7 @@ function ckeditor_ckeditor_plugin() {
         if (preg_match('#@file ([^\n\r]*)#', $source, $matches)) {
           $plugins[$file] = array(
             'name' => $file,
-            'desc' => t($matches[1]),
+            'desc' => check_plain($matches[1]),
             'path' => $plugin_dir_additional . $file . '/',
             'buttons' => (count($buttons) > 0) ? $buttons : FALSE,
             'default' => 'f'
@@ -186,7 +203,7 @@ function ckeditor_ckeditor_plugin() {
         else {
           $plugins[$file] = array(
             'name' => $file,
-            'desc' => t('Plugin file: ' . $file),
+            'desc' => t('Plugin file: @plugin_filename', array('@plugin_filename' => $file)),
             'path' => $plugin_dir_additional . $file . '/',
             'buttons' => (count($buttons) > 0) ? $buttons : FALSE,
             'default' => 'f'