diff --git a/plugins/convert_linebreaks/convert_linebreaks.css b/plugins/convert_linebreaks/convert_linebreaks.css
index 084063c..294eae5 100644
--- a/plugins/convert_linebreaks/convert_linebreaks.css
+++ b/plugins/convert_linebreaks/convert_linebreaks.css
@@ -1,2 +1 @@
-
 /* Nothing to see here. */
\ No newline at end of file
diff --git a/plugins/convert_linebreaks/convert_linebreaks.js b/plugins/convert_linebreaks/convert_linebreaks.js
index 5b939eb..7b70d79 100644
--- a/plugins/convert_linebreaks/convert_linebreaks.js
+++ b/plugins/convert_linebreaks/convert_linebreaks.js
@@ -1,4 +1,3 @@
-
 // Adopted from Wordpress 2.8.1-beta editor.js.
 
 Drupal.wysiwyg.plugins.convert_linebreaks = {
@@ -6,66 +5,67 @@ Drupal.wysiwyg.plugins.convert_linebreaks = {
   invoke: function(data, settings, instanceId) {
     alert('This button does nothing, it belongs to the convert linebreaks plugin.');
   },
+
   attach: function(content, settings, instanceId) {
-    content = this.lbautop(content);
+    content = this.linebreaks_attach(content);
     return content;
   },
+
   detach: function(content, settings, instanceId) {
     // Don't need to do anything here.
     return content;
   },
 
-    // This function runs when the content is turned over to WYSIWYG
-    lbautop : function(lbvar) {
-
-      var blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6]';
+  // Prepare the content for the WYSIWYG Editor.
+  linebreaks_attach : function(content) {
 
-      // @TODO - Fix <hr /> elements. Right now an extra space is added to the following
-      // block-level element...
+    var blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6]';
 
-      if(lbvar == "") return lbvar;
-
-      if ( lbvar.indexOf('<object') != -1 ) {
-          lbvar = lbvar.replace(/<object[\s\S]+?<\/object>/g, function(a){
-              return a.replace(/[\r\n]+/g, '');
-          });
-      }
-
-      if ( lbvar.indexOf('<embed') != -1 ) {
-          lbvar = lbvar.replace(/<embed[\s\S]+?<\/embed>/g, function(a){
-              return a.replace(/[\r\n]+/g, '');
-          });
-      }
+    if (content == "") {
+      return content;
+    }
 
-      lbvar = lbvar.replace(/<[^<>]+>/g, function(a){
-          return a.replace(/[\r\n]+/g, ' ');
+    // Handle <object> and <embed> tags.
+    if (content.indexOf('<object') != -1) {
+      content = content.replace(/<object[\s\S]+?<\/object>/g, function(a) {
+        return a.replace(/[\r\n]+/g, '');
       });
+    }
+    if (content.indexOf('<embed') != -1) {
+      content = content.replace(/<embed[\s\S]+?<\/embed>/g, function(a) {
+        return a.replace(/[\r\n]+/g, '');
+      });
+    }
 
-      lbvar = lbvar + "\n\n";
-      lbvar = lbvar.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
-      lbvar = lbvar.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1");
-      lbvar = lbvar.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), "$1\n\n");
-      lbvar = lbvar.replace(new RegExp("\\r\\n|\\r", 'g'), "\n");
-      lbvar = lbvar.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n");
-      lbvar = lbvar.replace(new RegExp('([\\s\\S]+?)\\n\\n', 'mg'), "<p>$1</p>\n");
-      lbvar = lbvar.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
-      lbvar = lbvar.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('<p>\\s*<blockquote([^>]*)>', 'gi'), "<blockquote$1><p>");
-      lbvar = lbvar.replace(new RegExp('</blockquote>\\s*</p>', 'gi'), '</p></blockquote>');
-      lbvar = lbvar.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
-      lbvar = lbvar.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
-      lbvar = lbvar.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]');
+    content = content.replace(/<[^<>]+>/g, function(a) {
+      return a.replace(/[\r\n]+/g, ' ');
+    });
 
-      // Fix the pre|script tags
-      lbvar = lbvar.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
-          a = a.replace(/<br ?\/?>[\r\n]*/g, '\n');
-          return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n');
-      });
+    content = content + "\n\n";
+    content = content.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
+    content = content.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1");
+    content = content.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), "$1\n\n");
+    content = content.replace(new RegExp("\\r\\n|\\r", 'g'), "\n");
+    content = content.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n");
+    content = content.replace(new RegExp('([\\s\\S]+?)\\n\\n', 'mg'), "<p>$1</p>\n");
+    content = content.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
+    content = content.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
+    content = content.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1");
+    content = content.replace(new RegExp('<p>\\s*<blockquote([^>]*)>', 'gi'), "<blockquote$1><p>");
+    content = content.replace(new RegExp('</blockquote>\\s*</p>', 'gi'), '</p></blockquote>');
+    content = content.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1");
+    content = content.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
+    content = content.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
+    content = content.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
+    content = content.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
+    content = content.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]');
 
-      return lbvar;
-    }
+    // Fix <pre> and <script> tags.
+    content = content.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
+      a = a.replace(/<br ?\/?>[\r\n]*/g, '\n');
+      return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n');
+    });
+
+    return content;
+  }
 };
diff --git a/plugins/linebreaks/linebreaks.js b/plugins/linebreaks/linebreaks.js
index 4230819..c2a4eef 100644
--- a/plugins/linebreaks/linebreaks.js
+++ b/plugins/linebreaks/linebreaks.js
@@ -1,4 +1,3 @@
-
 // Adopted from Wordpress 2.8.1-beta editor.js.
 
 Drupal.wysiwyg.plugins.linebreaks = {
@@ -6,138 +5,138 @@ Drupal.wysiwyg.plugins.linebreaks = {
   invoke: function(data, settings, instanceId) {
     alert('This button does nothing, it belongs to the linebreaks plugin.');
   },
+
   attach: function(content, settings, instanceId) {
-    content = this.lbautop(content);
+    content = this.linebreaks_attach(content);
     return content;
   },
+
   detach: function(content, settings, instanceId) {
-    content = this.pre_lbautop(content);
+    content = this.linebreaks_detach(content);
     return content;
   },
 
-  // This function runs when the content is saved (or when WYSIWYG is disabled
-  // manually).
-  pre_lbautop : function(content) {
-      var blocklist1, blocklist2;
-
-      // Protect pre|script tags
-      content = content.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
-          a = a.replace(/<br ?\/?>[\r\n]*/g, '<lb_temp>');
-          return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '<lb_temp>');
+  // Clean up content for saving or turning off WYSIWYG.
+  linebreaks_detach : function(content) {
+    var blocklist1, blocklist2;
+
+    // Protect pre|script tags.
+    content = content.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
+      a = a.replace(/<br ?\/?>[\r\n]*/g, '<lb_temp>');
+      return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '<lb_temp>');
+    });
+
+    // Pretty it up for the source editor.
+    blocklist1 = 'blockquote|ul|ol|li|hr|table|thead|tbody|tr|th|td|div|h[1-6]|p';
+    content = content.replace(new RegExp('\\s*</('+blocklist1+')>\\s*', 'mg'), '</$1>\n');
+    content = content.replace(new RegExp('\\s*<(('+blocklist1+')[^>]*)>', 'mg'), '\n<$1>');
+
+    // Mark </p> if it has any attributes.
+    content = content.replace(new RegExp('(<p [^>]+>.*?)</p>', 'mg'), '$1</p#>');
+
+    // Separate <div> containing <p>.
+    content = content.replace(new RegExp('<div([^>]*)>\\s*<p>', 'mgi'), '<div$1>\n\n');
+
+    // Remove <p> and <br />.
+    content = content.replace(new RegExp('\\s*<p>', 'mgi'), '');
+    content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '\n\n');
+    content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n');
+    content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n');
+
+    // Fix some block element newline issues.
+    content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div');
+    content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n');
+    content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n');
+    content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption');
+
+    // Block elements which look nicer with two newlines before and after.
+    blocklist2 = 'blockquote|ul|ol|table|h[1-6]|pre';
+    content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n\n<$1>');
+    content = content.replace(new RegExp('\\s*</('+blocklist2+')>\\s*', 'mg'), '</$1>\n\n');
+    content = content.replace(new RegExp('\\s*<(hr ?[^>]*)\\s*>', 'mg'), '\n\n<$1>\n\n');
+
+    // Block elements which look nicer with one newline before and after.
+    blocklist3 = 'li|thead|tr|th|td';
+    content = content.replace(new RegExp('\\s*<(('+blocklist3+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
+    content = content.replace(new RegExp('\\s*</('+blocklist3+')>\\s*', 'mg'), '</$1>\n');
+    content = content.replace(new RegExp('<li([^>]*)>', 'g'), '\t<li$1>');
+
+    // Handle <object> and <embed> tags.
+    if (content.indexOf('<object') != -1) {
+      content = content.replace(/<object[\s\S]+?<\/object>/g, function(a){
+        return a.replace(/[\r\n]+/g, '');
       });
+    }
+    if (content.indexOf('<embed') != -1) {
+      content = content.replace(/<embed[\s\S]+?<\/embed>/g, function(a){
+        return a.replace(/[\r\n]+/g, '');
+      });
+    }
 
-      // Pretty it up for the source editor
-      blocklist1 = 'blockquote|ul|ol|li|hr|table|thead|tbody|tr|th|td|div|h[1-6]|p';
-      content = content.replace(new RegExp('\\s*</('+blocklist1+')>\\s*', 'mg'), '</$1>\n');
-      content = content.replace(new RegExp('\\s*<(('+blocklist1+')[^>]*)>', 'mg'), '\n<$1>');
-
-      // Mark </p> if it has any attributes.
-      content = content.replace(new RegExp('(<p [^>]+>.*?)</p>', 'mg'), '$1</p#>');
-
-      // Separate <div> containing <p>
-      content = content.replace(new RegExp('<div([^>]*)>\\s*<p>', 'mgi'), '<div$1>\n\n');
-
-      // Remove <p> and <br />
-      content = content.replace(new RegExp('\\s*<p>', 'mgi'), '');
-      content = content.replace(new RegExp('\\s*</p>\\s*', 'mgi'), '\n\n');
-      content = content.replace(new RegExp('\\n\\s*\\n', 'mgi'), '\n\n');
-      content = content.replace(new RegExp('\\s*<br ?/?>\\s*', 'gi'), '\n');
-
-      // Fix some block element newline issues
-      content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div');
-      content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n');
-      content = content.replace(new RegExp('\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*', 'gi'), '\n\n[caption$1[/caption]\n\n');
-      content = content.replace(new RegExp('caption\\]\\n\\n+\\[caption', 'g'), 'caption]\n\n[caption');
-
-      // Block elements which look nicer with two newlines before and after
-      blocklist2 = 'blockquote|ul|ol|table|h[1-6]|pre';
-      content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n\n<$1>');
-      content = content.replace(new RegExp('\\s*</('+blocklist2+')>\\s*', 'mg'), '</$1>\n\n');
-      content = content.replace(new RegExp('\\s*<(hr ?[^>]*)\\s*>', 'mg'), '\n\n<$1>\n\n');
-
-      // Block elements which look nicer with one newline before and after
-      blocklist3 = 'li|thead|tr|th|td';
-      content = content.replace(new RegExp('\\s*<(('+blocklist3+') ?[^>]*)\\s*>', 'mg'), '\n<$1>');
-      content = content.replace(new RegExp('\\s*</('+blocklist3+')>\\s*', 'mg'), '</$1>\n');
-      content = content.replace(new RegExp('<li([^>]*)>', 'g'), '\t<li$1>');
-
-      if ( content.indexOf('<object') != -1 ) {
-          content = content.replace(/<object[\s\S]+?<\/object>/g, function(a){
-              return a.replace(/[\r\n]+/g, '');
-          });
-      }
-
-      if ( content.indexOf('<embed') != -1 ) {
-          content = content.replace(/<embed[\s\S]+?<\/embed>/g, function(a){
-              return a.replace(/[\r\n]+/g, '');
-          });
-      }
-
-      // Unmark special paragraph closing tags
-      content = content.replace(new RegExp('</p#>', 'g'), '</p>\n\n');
-      content = content.replace(new RegExp('\\s*(<p [^>]+>.*</p>)', 'mg'), '\n\n$1');
-
-      // Trim whitespace
-      content = content.replace(new RegExp('^\\s*', ''), '');
-      content = content.replace(new RegExp('[\\s\\u00a0]*$', ''), '');
-
-      // put back the line breaks in pre|script
-      content = content.replace(/<lb_temp>/g, '\n');
-      // Hope.
-      return content;
-    },
+    // Unmark special paragraph closing tags.
+    content = content.replace(new RegExp('</p#>', 'g'), '</p>\n\n');
+    content = content.replace(new RegExp('\\s*(<p [^>]+>.*</p>)', 'mg'), '\n\n$1');
 
-    // This function runs when the content is turned over to WYSIWYG
-    lbautop : function(lbvar) {
+    // Trim whitespace.
+    content = content.replace(new RegExp('^\\s*', ''), '');
+    content = content.replace(new RegExp('[\\s\\u00a0]*$', ''), '');
 
-      var blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6]';
+    // Put back linebreaks in <pre> and <script> tags.
+    content = content.replace(/<lb_temp>/g, '\n');
 
-      // @TODO - Fix <hr /> elements. Right now an extra space is added to the following
-      // block-level element...
+    return content;
+  },
 
-      if(lbvar == "") return lbvar;
+  // Prepare the content for the WYSIWYG Editor.
+  linebreaks_attach : function(content) {
 
-      if ( lbvar.indexOf('<object') != -1 ) {
-          lbvar = lbvar.replace(/<object[\s\S]+?<\/object>/g, function(a){
-              return a.replace(/[\r\n]+/g, '');
-          });
-      }
+    var blocklist = 'table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|hr|pre|select|form|blockquote|address|math|p|h[1-6]';
 
-      if ( lbvar.indexOf('<embed') != -1 ) {
-          lbvar = lbvar.replace(/<embed[\s\S]+?<\/embed>/g, function(a){
-              return a.replace(/[\r\n]+/g, '');
-          });
-      }
+    if (content == "") {
+      return content;
+    }
 
-      lbvar = lbvar.replace(/<[^<>]+>/g, function(a){
-          return a.replace(/[\r\n]+/g, ' ');
+    // Handle <object> and <embed> tags.
+    if (content.indexOf('<object') != -1) {
+      content = content.replace(/<object[\s\S]+?<\/object>/g, function(a) {
+        return a.replace(/[\r\n]+/g, '');
       });
-
-      lbvar = lbvar + "\n\n";
-      lbvar = lbvar.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
-      lbvar = lbvar.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1");
-      lbvar = lbvar.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), "$1\n\n");
-      lbvar = lbvar.replace(new RegExp("\\r\\n|\\r", 'g'), "\n");
-      lbvar = lbvar.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n");
-      lbvar = lbvar.replace(new RegExp('([\\s\\S]+?)\\n\\n', 'mg'), "<p>$1</p>\n");
-      lbvar = lbvar.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
-      lbvar = lbvar.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('<p>\\s*<blockquote([^>]*)>', 'gi'), "<blockquote$1><p>");
-      lbvar = lbvar.replace(new RegExp('</blockquote>\\s*</p>', 'gi'), '</p></blockquote>');
-      lbvar = lbvar.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
-      lbvar = lbvar.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
-      lbvar = lbvar.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
-      lbvar = lbvar.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]');
-
-      // Fix the pre|script tags
-      lbvar = lbvar.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
-          a = a.replace(/<br ?\/?>[\r\n]*/g, '\n');
-          return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n');
+    }
+    if (content.indexOf('<embed') != -1) {
+      content = content.replace(/<embed[\s\S]+?<\/embed>/g, function(a) {
+        return a.replace(/[\r\n]+/g, '');
       });
-
-      return lbvar;
     }
+
+    content = content.replace(/<[^<>]+>/g, function(a) {
+      return a.replace(/[\r\n]+/g, ' ');
+    });
+
+    content = content + "\n\n";
+    content = content.replace(new RegExp('<br />\\s*<br />', 'gi'), "\n\n");
+    content = content.replace(new RegExp('(<(?:'+blocklist+')[^>]*>)', 'gi'), "\n$1");
+    content = content.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), "$1\n\n");
+    content = content.replace(new RegExp("\\r\\n|\\r", 'g'), "\n");
+    content = content.replace(new RegExp("\\n\\s*\\n+", 'g'), "\n\n");
+    content = content.replace(new RegExp('([\\s\\S]+?)\\n\\n', 'mg'), "<p>$1</p>\n");
+    content = content.replace(new RegExp('<p>\\s*?</p>', 'gi'), '');
+    content = content.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
+    content = content.replace(new RegExp("<p>(<li.+?)</p>", 'gi'), "$1");
+    content = content.replace(new RegExp('<p>\\s*<blockquote([^>]*)>', 'gi'), "<blockquote$1><p>");
+    content = content.replace(new RegExp('</blockquote>\\s*</p>', 'gi'), '</p></blockquote>');
+    content = content.replace(new RegExp('<p>\\s*(</?(?:'+blocklist+')[^>]*>)', 'gi'), "$1");
+    content = content.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*</p>', 'gi'), "$1");
+    content = content.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n");
+    content = content.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1");
+    content = content.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1');
+    content = content.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[caption([^\\[]+)\\[/caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[caption$1[/caption]');
+
+    // Fix <pre> and <script> tags.
+    content = content.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
+      a = a.replace(/<br ?\/?>[\r\n]*/g, '\n');
+      return a.replace(/<\/?p( [^>]*)?>[\r\n]*/g, '\n');
+    });
+
+    return content;
+  }
 };
diff --git a/wysiwyg_linebreaks.info b/wysiwyg_linebreaks.info
index e5fb3ff..219bb03 100644
--- a/wysiwyg_linebreaks.info
+++ b/wysiwyg_linebreaks.info
@@ -2,6 +2,8 @@ name = Wysiwyg Force Linebreaks
 description = Plugin to allow legacy content editing and more sane formatting in wysiwyg editors.
 package = User interface
 core = 7.x
+
 dependencies[] = wysiwyg
+
 files[] = wysiwyg_linebreaks.module
-files[] = plugins/linebreaks.inc
\ No newline at end of file
+files[] = plugins/linebreaks.inc