Index: preferences.xul
===================================================================
--- preferences.xul	(revision 3564)
+++ preferences.xul	(working copy)
@@ -58,6 +58,9 @@
 #ifdef XP_MACOSX
 <?xul-overlay href="chrome://browser/content/macBrowserOverlay.xul"?>
 #endif
+#ifndef XP_MACOSX
+#include ../../base/content/flock-global-overlays.inc
+#endif
 
 <prefwindow type="prefwindow"
             id="BrowserPreferences"
Index: blog.xul
===================================================================
--- blog.xul	(revision 3564)
+++ blog.xul	(working copy)
@@ -35,13 +35,13 @@
     <prefpane id="paneBlog" onpaneload="flock_prefBlogLoad()" flex="1">
             
     <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/preferences/general.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/flock/contrib/dojo.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/flock/common/flock.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/flock/contrib/rdfds.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/flock/common/command.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/flock/blog/blogCommon.js"/>
-    <script type="application/x-javascript" src="chrome://browser/content/flock/blog/blogSettings.js"/>
+    <!--<script type="application/x-javascript" src="chrome://browser/content/preferences/general.js"/>-->
+    <!--<script type="application/x-javascript" src="chrome://browser/content/flock/contrib/dojo.js"/>-->
+    <!--<script type="application/x-javascript" src="chrome://browser/content/flock/common/flock.js"/>-->
+    <!--<script type="application/x-javascript" src="chrome://browser/content/flock/contrib/rdfds.js"/>-->
+    <!--<script type="application/x-javascript" src="chrome://browser/content/flock/common/command.js"/>-->
+    <!--<script type="application/x-javascript" src="chrome://browser/content/flock/blog/blogCommon.js"/>-->
+    <!--<script type="application/x-javascript" src="chrome://browser/content/flock/blog/blogSettings.js"/>-->
     <script type="application/x-javascript" src="chrome://browser/content/preferences/blog.js"/>
 
     <preferences>