--- a/src/dev/project-areas.en.html
+++ b/src/dev/project-areas.en.html
@@ -48,90 +48,160 @@ If the table is too wide for your little
   <th>Description</th>
   <th>Owner</th>
   <th>Peer(s)</th>
 </tr>
 </thead>
 
 <tbody>
 <tr>
-  <td><b>User Interface</b></td>
+  <td><b>Suite Components</b></td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
-  <td>Neil ("UI tsar")</td>
-  <td>IanN, Mnyromyr</td>
+  <td>IanN</td>
+  <td>Mnyromyr, Neil, Ratty</td>
 </tr>
 <tr>
-  <td rowspan="2">&nbsp;</td>
-  <td>UI design</td>
-  <td>achieving consistency throughout the product both internally and
-    externally</td>
-  <td>&nbsp;</td>
+  <td rowspan="21">&nbsp;</td>
+  <td>Add-ons &amp; Developer Tools</td>
+  <td>Integration of add-ons and developer tools within the suite</td>
+  <td>Ratty</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
-  <td>Themes</td>
-  <td>Classic, Modern, general theme issues</td>
+  <td>Autocomplete and Location Bar</td>
+  <td>Autocomplete widget, browser and mailnews addresses and location bar</td>
   <td>&nbsp;</td>
-  <td>KaiRo, MReimer, Ratty, stefanh</td>
-</tr>
-
-<tr>
-  <td><b>Browser</b></td>
-  <td>&nbsp;</td>
-  <td>Navigator UI and parts of the suite that are mainly used by the browser
-   (some may be shared with Mail or Composer to a certain extent though)</td>
-  <td>Neil</td>
-  <td>IanN, Mnyromyr</td>
+  <td>frg, Ratty</td>
 </tr>
 <tr>
-  <td rowspan="6">&nbsp;</td>
   <td>Bookmarks &amp; History</td>
   <td>includes adding, deleting, editing bookmarks, problems with Bookmarks
     Manager, Bookmarks toolbar and menu, History window and "Go" menu.</td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
+  <td>Build Config</td>
+  <td>Issues around building SeaMonkey</td>
+  <td>frg</td>
+  <td>adriank, ewong, KaiRo, IanN, stefanh</td>
+</tr>
+<tr>
+  <td>Composer</td>
+  <td>UI issues within Composer, toolbars, buttons, menus, dialogs. Application
+    launch issues too.</td>
+  <td>IanN</td>
+  <td>frg, Ratty</td>
+</tr>
+<tr>
   <td>Download &amp; File Handling</td>
   <td>Download Manager, helper apps, open/save files</td>
   <td>&nbsp;</td>
+  <td>frg</td>
+</tr>
+<tr>
+  <td>Feed Discovery and Preview</td>
+  <td>discovery of feeds and inline preview</td>
+  <td>mcsmurf</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
+  <td>Find in Page</td>
+  <td>find in page used for browser and mailnews</td>
+  <td>&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td>Help Documentation</td>
+  <td>help menus and help content</td>
+  <td>IanN</td>
+  <td>RainerB, rsx11m, stefanh</td>
+</tr>
+<tr>
+  <td>Help Viewer</td>
+  <td>help viewer</td>
+  <td>&nbsp;</td>
+  <td>frg</td>
+</tr>
+<tr>
+  <td>Installer &amp; OS Integration</td>
+  <td>&nbsp;</td>
+  <td>mcsmurf</td>
+  <td>ewong, KaiRo, frg, rsx11m, stefanh</td>
+</tr>
+<tr>
   <td>Page Info</td>
   <td>&nbsp;</td>
-  <td>db48x</td>
   <td>&nbsp;</td>
+  <td>frg</td>
+</tr>
+<tr>
+  <td>Passwords &amp; Permissions &amp; Security</td>
+  <td>Includes Data Manager and UI for Passwords, PopUp/Image blocking,
+    Cookies; Wallet (Backend code for most of those is shared), Suite-specific security UI and features, app-level security issues, Tracking Protection and Safebrowsing</td>
+  <td></td>
+  <td>frg, rsx11m, dveditz (backend integration)</td>
 </tr>
 <tr>
-  <td>Passwords &amp; Permissions</td>
-  <td>Includes Data Manager and UI for Passwords, PopUp/Image blocking,
-    Cookies; Wallet (Backend code for most of those is shared)</td>
-  <td>KaiRo (Data Manager)</td>
-  <td>dveditz (backend integration)</td>
+  <td>Preferences</td>
+  <td>Preference Panels; default preferences; etc.</td>
+  <td>IanN</td>
+  <td>frg, Mnyromyr, rsx11m</td>
+</tr>
+<tr>
+  <td>Release Engineering</td>
+  <td>all aspects of the Build and Release Engineering process, including
+    Build/Release Automation, nightly build machines, and buildbots</td>
+  <td>Callek</td>
+  <td>ewong, KaiRo</td>
 </tr>
 <tr>
   <td>Search &amp; Sidebar</td>
   <td>Sidebar (incl. internal panels), web search features</td>
   <td>Mnyromyr</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
-  <td>Tabbed Browser</td>
-  <td>browser tab features and the tabbed browser widget</td>
-  <td>Misak</td>
+  <td>Session Restore &amp; Tabbed Browser</td>
+  <td>session management, browser tab features and the tabbed browser widget</td>
+  <td>&nbsp;</td>
+  <td>frg, Ratty</td>
+</tr>
+<tr>
+  <td>Startup &amp; Profiles</td>
+  <td>Profile Manager, profile access code, suite startup</td>
+  <td>&nbsp;</td>
+  <td>Callek, IanN</td>
+</tr>
+<tr>
+  <td>Sync UI</td>
+  <td>&nbsp;</td>
+  <td>&nbsp;</td>
+  <td>&nbsp;</td>
+</tr>
+<tr>
+  <td>Testing Infrastructure</td>
+  <td>testing infrastructure that is specific to the SeaMonkey code</td>
+  <td>&nbsp;</td>
+  <td>frg, IanN, Ratty</td>
+</tr>
+<tr>
+  <td>Themes &amp; UI design</td>
+  <td>Classic, Modern, general theme issues and achieving consistency throughout the product both internally and externally</td>
   <td>Ratty</td>
+  <td>frg, IanN, Mynroymr, rsx11m, stefanh</td>
 </tr>
+
 <tr>
   <td><b>MailNews</b></td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
   <td>Mnyromyr</td>
-  <td>IanN, Neil</td>
+  <td>IanN, Neil, Ratty</td>
 </tr>
 <tr>
   <td rowspan="6">&nbsp;</td>
   <td>MailNews: Account Management &amp; Configuration</td>
   <td>Account Manager/Wizard, Preferences panels, etc.</td>
   <td>IanN</td>
   <td>&nbsp;</td>
 </tr>
@@ -141,189 +211,80 @@ If the table is too wide for your little
   <td>&nbsp;</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
   <td>MailNews: Backend</td>
   <td>Watch backend closely, make us work with it, help improving it;
     includes: Transmission (receiving, sending, receipts), offline,
     (junk) filters, storage bugs, etc.</td>
-  <td>bienvenu</td>
+  <td>&nbsp;</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
   <td>MailNews: Composition</td>
   <td>Compose window, etc.</td>
   <td>IanN</td>
-  <td>&nbsp;</td>
+  <td>rsx11m</td>
 </tr>
 <tr>
   <td>MailNews: General</td>
   <td>&nbsp;</td>
   <td>&nbsp;</td>
-  <td>&nbsp;</td>
+  <td>frg, rsx11m</td>
 </tr>
 <tr>
   <td>MailNews: Message Display</td>
   <td>Main window; display of mails, news, maybe RSS; search;
     notifications; drag'n'drop; etc.</td>
   <td>IanN</td>
-  <td>&nbsp;</td>
-</tr>
-<tr>
-  <td><b>Composer</b></td>
-  <td>Composer</td>
-  <td>UI issues within Composer, toolbars, buttons, menus, dialogs. Application
-    launch issues too.</td>
-  <td>Neil</td>
-  <td>IanN, kaze, timeless</td>
-</tr>
-
-<tr>
-  <td colspan="2"><b>Cross-suite components</b></td>
-  <td>&nbsp;</td>
-  <td>Neil</td>
-  <td>&nbsp;</td>
-</tr>
-<tr>
-  <td rowspan="14">&nbsp;</td>
-  <td>Autocomplete, Find in Page &amp; Location Bar</td>
-  <td>Autocomplete widget, find in page used for browser and mailnews addresses
-    and location bar</td>
-  <td>&nbsp;</td>
-  <td>IanN</td>
-</tr>
-<tr>
-  <td>Build Config</td>
-  <td>Issues around building SeaMonkey</td>
-  <td>Callek</td>
-  <td>KaiRo</td>
-</tr>
-<tr>
-  <td>Feed Discovery and Preview</td>
-  <td>discovery of feeds and inline preview</td>
-  <td>mcsmurf</td>
-  <td>IanN</td>
-</tr>
-<tr>
-  <td>Help</td>
-  <td>help menus, help viewer and help content</td>
-  <td>IanN</td>
-  <td>stefanh, InvisibleSmiley</td>
-</tr>
-<tr>
-  <td>Installer</td>
-  <td>&nbsp;</td>
-  <td>mcsmurf</td>
-  <td>Callek</td>
-</tr>
-<tr>
-  <td>Integration of external apps</td>
-  <td>integration of chatzilla, inspector, venkman, calendar, etc.</td>
-  <td>&nbsp;</td>
-  <td>IanN, Ratty</td>
-</tr>
-<tr>
-  <td>OS Integration</td>
-  <td>&nbsp;</td>
-  <td>mcsmurf</td>
-  <td>IanN</td>
-</tr>
-<tr>
-  <td>Preferences</td>
-  <td>Preference Panels; default preferences; etc.</td>
-  <td>IanN</td>
-  <td>Mnyromyr</td>
-</tr>
-<tr>
-  <td>Release Engineering</td>
-  <td>all aspects of the Build and Release Engineering process, including
-    Build/Release Automation, nightly build machines, and buildbots</td>
-  <td>Callek</td>
-  <td>ewong, KaiRo</td>
-</tr>
-<tr>
-  <td>Security</td>
-  <td>Suite-specific security UI and features, app-level security issues</td>
-  <td>&nbsp;</td>
-  <td>dveditz (backend integration), IanN</td>
-</tr>
-<tr>
-  <td>Sessions Restore</td>
-  <td>&nbsp;</td>
-  <td>Misak</td>
-  <td>IanN</td>
-</tr>
-<tr>
-  <td>Startup &amp; Profiles</td>
-  <td>Profile Manager, profile access code, suite startup</td>
-  <td>&nbsp;</td>
-  <td>Callek, IanN</td>
-</tr>
-<tr>
-  <td>Sync UI</td>
-  <td>&nbsp;</td>
-  <td>InvisibleSmiley</td>
-  <td>IanN</td>
-</tr>
-<tr>
-  <td>Testing Infrastructure</td>
-  <td>testing infrastructure that is specific to the SeaMonkey code</td>
-  <td>&nbsp;</td>
-  <td>Callek, IanN, sgautherie</td>
+  <td>frg, rsx11m</td>
 </tr>
 <tr>
   <td><b>Project Organisation</b></td>
   <td>Project Organization</td>
   <td>not real suite code, but all the stuff around it</td>
   <td>SeaMonkey Council</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
-  <td rowspan="7">&nbsp;</td>
-  <td>Project Management</td>
-  <td>someone needs to drive those things and feel responsible for getting
-    SeaMonkey Council decisions</td>
-  <td>Callek</td>
-  <td>&nbsp;</td>
-</tr>
-<tr>
+  <td rowspan="6">&nbsp;</td>
   <td>Release Management</td>
   <td>get releases out the door, write up release notes</td>
-  <td>Callek</td>
-  <td>KaiRo, InvisibleSmiley (release notes), ewong (build)</td>
+  <td>ewong</td>
+  <td>adriank, frg, KaiRo, mcsmurf, rsx11m (release notes)</td>
 </tr>
 <tr>
   <td>MoFo liaison</td>
   <td>keep an open line with MoFo folks and take care of stuff we need of
     them or they need of us</td>
-  <td>KaiRo</td>
-  <td>Callek</td>
+  <td>IanN</td>
+  <td>Callek, KaiRo</td>
 </tr>
 <tr>
   <td>Quality Assurance (QA), General</td>
   <td>Testing, bug triaging, smoketests, bug triaging, testing...</td>
   <td>&nbsp;</td>
-  <td>Callek, Ratty, sgautherie, tonymec</td>
+  <td>RainerB, Ratty, rsx11m, tonymec</td>
 </tr>
 <tr>
   <td>Community, User Relations, Support</td>
   <td>&nbsp;</td>
   <td>Ratty</td>
-  <td>&nbsp;</td>
+  <td>RainerB, tonymec</td>
 </tr>
 <tr>
   <td>Web pages</td>
   <td>seamonkey-project.org</td>
-  <td>InvisibleSmiley</td>
-  <td>Callek, KaiRo</td>
+  <td>mcsmurf</td>
+  <td>frg, rsx11m</td>
 </tr>
 <tr>
   <td>Marketing/Press/PR/Shop, spokesman</td>
   <td>&nbsp;</td>
-  <td>Callek</td>
-  <td>InvisibleSmiley, KaiRo, Jeff Lee (shop)</td>
+  <td>mcsmurf</td>
+  <td>KaiRo, IanN</td>
 </tr>
 </tbody>
 </table>
 
 </body>
 </html>