diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
index 10a8a39c56..335f38c148 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.features.inc
@@ -137,8 +137,8 @@ function boinc_standard_flag_default_flags() {
     'title' => 'Subscriptions',
     'global' => '0',
     'types' => array(
-      '0' => 'news',
-      '1' => 'forum',
+      '0' => 'forum',
+      '1' => 'news',
     ),
     'flag_short' => 'subscribe',
     'flag_long' => 'Subscribe to this topic',
@@ -161,7 +161,7 @@ function boinc_standard_flag_default_flags() {
     'show_on_teaser' => 1,
     'show_on_form' => 0,
     'access_author' => '',
-    'i18n' => 0,
+    'i18n' => '0',
     'module' => 'boinc_standard',
     'locked' => array(
       '0' => 'name',
@@ -244,9 +244,9 @@ Total reports of this comment: [comment:flag-abuse-comment-count]',
                   ),
                   'from' => array(
                     '0' => ':global',
-          ),
-        ),
-        ),
+                  ),
+                ),
+              ),
             ),
             '#type' => 'action',
             '#weight' => 0,
diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.wysiwyg.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.wysiwyg.inc
index a52bac73cf..4ba9813725 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.wysiwyg.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.wysiwyg.inc
@@ -50,14 +50,14 @@ function boinc_standard_default_wysiwyg() {
       'font' => array(
         'formatselect' => 1,
       ),
+      'paste' => array(
+        'pastetext' => 1,
+      ),
       'media' => array(
         'media' => 1,
       ),
-      'imce' => array(
-        'imce' => 1,
-      ),
       'drupal' => array(
-        'convert_linebreaks' => 1,
+        'linebreaks' => 1,
       ),
     ),
     'toolbar_loc' => 'top',
@@ -67,9 +67,9 @@ function boinc_standard_default_wysiwyg() {
     'verify_html' => 1,
     'preformatted' => 0,
     'convert_fonts_to_spans' => 1,
-    'remove_linebreaks' => 0,
+    'remove_linebreaks' => 1,
     'apply_source_formatting' => 0,
-    'paste_auto_cleanup_on_paste' => 0,
+    'paste_auto_cleanup_on_paste' => 1,
     'block_formats' => 'p,code,pre,h2,h3,h4,h5,h6,div,address',
     'css_setting' => 'theme',
     'css_path' => '',
diff --git a/drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-help.inc b/drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-help.inc
index 2cc274a9df..5cf43278df 100644
--- a/drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-help.inc
+++ b/drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-help.inc
@@ -18,6 +18,13 @@ function _bbcode_filter_tip() {
  you will see in the examples below. If you mistype a tag or forget to 
  close it, you will not get the desired formatting.
 </p>
+<p>
+When using the Rich-text editor, loaded by default, ENTER will place a
+new paragraph and SHIFT-ENTER will place a new line. There are some
+BBCode tags that will not work with ENTER (new paragraph), e.g., the
+[list] tag. In general, when entering a line break within a BBCode
+tag, please use SHIFT-ENTER.
+</p>
 
 <h3>Simple text formatting</h3>
 
@@ -250,11 +257,6 @@ I love
  will be displayed.
 </p>
 
-<p>
- Similarly, the <strong>[php]</strong> tag can be used to post PHP code. 
- PHP code will automatically be syntax highlighted for easier readability.
-</p>
-
 <table width=\"98%\">
  <tr>
   <th>usage</th><th>display</th>
@@ -285,27 +287,6 @@ An HTML title example:<br />
  </tr>
  <tr>
  </tr>
- <tr>
-  <td>
-Some PHP code:<br />
-[php]<br />
-&lt;?php<br />
-function hello()<br />
-{<br />
-&nbsp;&nbsp;echo \"Hello World!\";<br />
-}<br />
-?&gt;<br />
-[/php]
-  </td>
-  <td valign=top>
-Some PHP code:<br />
-<div class=\"codeblock\"><code>
-<font color=\"#000000\">
-<font color=\"#0000BB\">&lt;?php<br /></font><font color=\"#007700\">function </font><font color=\"#0000BB\">hello</font><font color=\"#007700\">()<br />{<br />&nbsp;&nbsp;echo </font><font color=\"#DD0000\">\"Hello World!\"</font><font color=\"#007700\">;<br />}<br /><font color=\"#0000BB\">?&gt;</font>
-</font>
-</code>
-  </td>
- </tr>
 </table>
 
 <h3>Text and block alignment</h3>