diff --git a/browser/base/content/browser-scripts.inc b/browser/base/content/browser-scripts.inc
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b99c406980c..2600c192efc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -65,9 +65,12 @@
         screenX="4" screenY="4"
         persist="screenX screenY width height sizemode"> 
 
-# All JS files that browser.xul wishes to include *must* go into the browser-scripts.inc file
-# so that they can be shared by hiddenWindow.xul.
-#include browser-scripts.inc
+# All JS files which are not content (only) dependent that browser.xul
+# wishes to include *must* go into the global-scripts.inc file
+# so that they can be shared by macBrowserOverlay.xul.
+#include global-scripts.inc
+
+<script type="application/x-javascript" src="chrome://global/content/contentAreaUtils.js"/>
 
 # All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the 
 # browser-sets.inc file for sharing with hiddenWindow.xul.
diff --git a/browser/base/content/contents.rdf b/browser/base/content/contents.rdf
index a14cba02e18..e69de29bb2d 100644
--- a/browser/base/content/contents.rdf
+++ b/browser/base/content/contents.rdf
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:browser"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:browser"
-        chrome:displayName="Browser"
-        chrome:author="mozilla.org"
-        chrome:name="browser"
-        chrome:localeVersion="0.9.9"
-        chrome:skinVersion="1.5">
-  </RDF:Description>
-  
-# Overlays Points
-#ifdef XP_MACOSX
-  <RDF:Seq RDF:about="urn:mozilla:overlays">
-      <RDF:li RDF:resource="chrome://mozapps/content/downloads/downloads.xul"/>
-  </RDF:Seq>
-
-  <RDF:Seq RDF:about="chrome://mozapps/content/downloads/downloads.xul">
-      <RDF:li>chrome://browser/content/downloadManagerOverlay.xul</RDF:li>
-  </RDF:Seq>
-#endif
-</RDF:RDF>
-
diff --git a/browser/base/content/extensionsManagerOverlay.xul b/browser/base/content/extensionsManagerOverlay.xul
new file mode 100644
index 00000000000..fae3991c156
--- /dev/null
+++ b/browser/base/content/extensionsManagerOverlay.xul
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org code.
+#
+# The Initial Developer of the Original Code is Asaf Romano
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Asaf Romano <mozilla.mano@sent.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<overlay id="extensionsManagerOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+
+<window id="extensionsManager">
+
+#include browserMountPoints.inc
+
+</window>
+
+</overlay>
diff --git a/browser/base/content/global-scripts.inc b/browser/base/content/global-scripts.inc
new file mode 100644
index 00000000000..532a8f345e4
--- /dev/null
+++ b/browser/base/content/global-scripts.inc
@@ -0,0 +1,50 @@
+# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Ben Goodger <ben@bengoodger.com> (v2.0)
+#   Blake Ross <blakeross@telocity.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+<script type="application/x-javascript" src="chrome://global/content/findBar.js"/>
+<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarks.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/bookmarks/bookmarksMenu.js"/>
+<script type="application/x-javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/browser.js"/>
+<script type="application/x-javascript" src="chrome://global/content/XPCNativeWrapper.js"/>
+<script type="application/x-javascript" src="chrome://browser/content/sanitize.js"/>
diff --git a/browser/base/content/jsConsoleOverlay.xul b/browser/base/content/jsConsoleOverlay.xul
new file mode 100644
index 00000000000..c732269f1b9
--- /dev/null
+++ b/browser/base/content/jsConsoleOverlay.xul
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is Mozilla.org code.
+#
+# The Initial Developer of the Original Code is Asaf Romano
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Asaf Romano <mozilla.mano@sent.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+<overlay id="jsConsoleOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
+
+<window id="JSConsoleWindow">
+
+#include browserMountPoints.inc
+
+</window>
+
+</overlay>
diff --git a/browser/base/content/macBrowserOverlay.xul b/browser/base/content/macBrowserOverlay.xul
index 20e6789f6a2..1f2d55f483c 100644
--- a/browser/base/content/macBrowserOverlay.xul
+++ b/browser/base/content/macBrowserOverlay.xul
@@ -50,9 +50,10 @@
 
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 
-# All JS files that browser.xul wishes to include *must* go into the browser-scripts.inc file
-# so that they can be shared by hiddenWindow.xul.
-#include browser-scripts.inc
+# All JS files which are not content (only) dependent that browser.xul
+# wishes to include *must* go into the global-scripts.inc file
+# so that they can be shared by this overlay.
+#include global-scripts.inc
 
 <script type="application/x-javascript">
   addEventListener("load", nonBrowserWindowStartup, false);
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 668d0274b27..f8f38d9e60d 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -1,5 +1,5 @@
 browser.jar:
-        content/browser/contents.rdf                  (content/contents.rdf)
+*       content/browser/contents.rdf                  (content/contents.rdf)
         content/browser-region/contents.rdf           (content/contents-region.rdf)
 *       content/browser/aboutDialog.xul               (content/aboutDialog.xul)
 *       content/browser/aboutDialog.js                (content/aboutDialog.js)
@@ -32,6 +32,8 @@ browser.jar:
 #ifdef XP_MACOSX
 *       content/browser/macBrowserOverlay.xul         (content/macBrowserOverlay.xul)
 *       content/browser/downloadManagerOverlay.xul    (content/downloadManagerOverlay.xul)
+*       content/browser/extensionsManagerOverlay.xul  (content/extensionsManagerOverlay.xul)
+*       content/browser/jsConsoleOverlay.xul          (content/jsConsoleOverlay.xul)
 #endif
 #ifndef MOZ_USE_OFFICIAL_BRANDING
   content/branding/contents.rdf                  (branding/contents.rdf)