diff --git a/minimo/chrome/content/preferences/preferences.xul b/minimo/chrome/content/preferences/preferences.xul
index 599d34ebec23..ca499ddd8718 100644
--- a/minimo/chrome/content/preferences/preferences.xul
+++ b/minimo/chrome/content/preferences/preferences.xul
@@ -1,49 +1,46 @@
-<?xml version="1.0"?>  <!-- -*- Mode: HTML -*- -->
-
+<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
 <!-- ***** 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 Communicator client code, released
- March 31, 1998.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corporation.
- Portions created by the Initial Developer are Copyright (C) 1998-2000
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-   Marcio S. Galli, mgalli@geckonnection.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 ***** -->
+     - 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 Minimo.
+     -
+     - The Initial Developer of the Original Code is
+     - Marcio S. Galli
+     - Portions created by the Initial Developer are Copyright (C) 2005
+     - the Initial Developer. All Rights Reserved.
+     -
+     - Contributor(s):
+     -   Marcio S. Galli <mgalli@geckonnection.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 LGPL or the GPL. 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 ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-
-<!-- The folling has to be exactly defined here, there is JS function accessing the styleSheet direct 
-     for ZOOMing --> 
 <?xml-stylesheet href="chrome://minimo/skin/minimo.css" type="text/css"?> 
+
 <?xml-stylesheet href="chrome://minimo/skin/preferences.css" type="text/css"?>
+
 <?xml-stylesheet href="chrome://minimo/content/bindings/preferences.css" type="text/css"?> 
 
 <?xul-overlay href="chrome://minimo/content/preferences/pane-general.xul"?>
@@ -72,6 +69,7 @@
   <!-- defined in minimo/content/bindings/preferences.css and preferences.xml -->  
 
   <preferenceset id="prefsInstance" >
+  
       <preferenceitem preftype="string"  id="browser.startup.homepage" name="browserStartupHomepage" />
       <preferenceitem preftype="bool"    id="browser.shell.checkDefaultBrowser" name="setDefaultBrowser" />
       <preferenceitem preftype="int"     id="permissions.default.image" name="enableImages" />
@@ -81,44 +79,43 @@
       <preferenceitem preftype="int"     id="network.proxy.type" name="UseProxy" />
       <preferenceitem preftype="string"  id="network.proxy.http" name="networkProxyHTTP" />
       <preferenceitem preftype="int"     id="network.proxy.http_port" name="networkProxyHTTP_Port" />
+      <preferenceitem preftype="file"    id="browser.cache.disk.parent_directory" name="storeCacheStorageCard" />
       <preferenceitem preftype="bool"    id="browser.cache.disk.enable" name="useDiskCache" />
-      <preferenceitem preftype="string"  id="browser.cache.disk.parent_directory" name="storeCacheStorageCard" />
       <preferenceitem preftype="bool"    id="network.prefetch-next" name="enablePreFetching" />
       <preferenceitem preftype="int"     id="browser.cache.disk.capacity" name="cacheSizeField" />
       <preferenceitem preftype="file"    id="browser.download.dir" name="downloadDir" />
       <preferenceitem preftype="bool"    id="browser.download.progressDnlgDialog.dontAskForLaunch" name="dontAskForLaunch" />
+      <preferenceitem preftype="bool"    id="ui.fullscreen" name="setFullscreen" />
+      <preferenceitem preftype="bool"    id="ui.homebar" name="setHomebar" />
+      
   </preferenceset>
   
-
   <command id="cmd_PrefOkay"      oncommand="PrefOkay()" />
   <command id="cmd_PrefCancel"    oncommand="PrefCancel();" />
-  <vbox flex="1">
 
-    <hbox class="pref-toolbar">
-      <toolbar id="pref-bar" flex="1" accessfocus="general-button" accessnextrule="general-pane"  accessprevrule="general-pane" >    
-        <toolbarbutton class="base-button" tabindex="1" accessrule="pref-bar" onfocus="show('general-pane',this)" accessfocus="general-pane" id="general-button" accesskey="m" ></toolbarbutton>  
-        <toolbarbutton class="base-button" tabindex="2" accessrule="pref-bar" onfocus="show('advanced-pane',this)" accessfocus="advanced-pane" id="advanced-button" />  
-        <toolbarbutton class="base-button" tabindex="3" accessrule="pref-bar" onfocus="show('privacy-pane',this)" accessfocus="advanced-pane" id="privacy-button"  />  
-        <toolbarbutton class="base-button" tabindex="4" accessrule="pref-bar" onfocus="show('connection-pane',this)" accessfocus="advanced-pane" id="connection-button" />  
-      </toolbar>
- 
-      <!-- For the OKAY CANCEL buttons --> 
+<!-- Preferences panel -->
 
-      <toolbar id="dialog-bar">
-        <toolbarbutton tabindex="8" accessrule="pref-bar"  accessfocus="advanced-pane" id="okay-button"  command="cmd_PrefOkay"><label class='dialog-button' value="&okayButton.label;" /></toolbarbutton>  
-        <toolbarbutton tabindex="9" accessrule="pref-bar"  accessfocus="advanced-pane" id="cancel-button"  command="cmd_PrefCancel"><label class='dialog-button' value="&cancelButton.label;" /></toolbarbutton>  
-      </toolbar>
-    </hbox>
-    
-    <!-- MINIMO PREFERENCES XUL, NOT IN XBL, SO INSTRUCTIONS --> 
-    <!-- =================================================== -->
-    <!-- For each pref use attribute preference="prefname"   --> 
-    <!-- and onchange="syncPref(this)" or onclick="syncPref( --> 
-    <!-- the syncPref tells the OKAY function to push prefs  --> 
-    <!-- =================================================== -->
-    
-    <box id="pref-panes" flex="1">  
-    </box>
+<vbox flex="1" class="base" >
 
-  </vbox>
+  <hbox class="pref-toolbar">
+		
+    <button  oncommand="focusSkipToPanel()" onfocus="show('general-pane',this)"    id="general-button" />  
+    <button  oncommand="focusSkipToPanel()" onfocus="show('advanced-pane',this)"   id="advanced-button" />  
+    <button  oncommand="focusSkipToPanel()" onfocus="show('connection-pane',this)" id="connection-button"  />  
+    <button  oncommand="focusSkipToPanel()" onfocus="show('privacy-pane',this)"    id="privacy-button"   />  
+    <button  oncommand="focusSkipToPanel()" onfocus="show('summary-pane',this)"    id="okay-button" command="cmd_PrefOkay"><label  class='dialog-button' value="&okayButton.label;" /></button >     
+
+  </hbox >      
+  
+  <hbox style="height:6px" />
+
+  <scrollbox id="scroller"  onfocus="fixXULAutoScroll(event)"  style="" flex="1">
+     <hbox id="pref-panes" flex="1" >
+
+	 </hbox>
+  </scrollbox>
+
+  <hbox id="refBottom" />
+
+</vbox>
 </window>