diff --git a/minimo/base/Makefile.in b/minimo/base/Makefile.in
index 6d1449b5608..5d038143250 100755
--- a/minimo/base/Makefile.in
+++ b/minimo/base/Makefile.in
@@ -95,11 +95,8 @@ ifdef WINCE
 RCINCLUDE  = wince/SplashScreen.rc
 endif
 
-EXTRA_DSO_LIBS	= embed_base_s profdirserviceprovider_s
-
-LIBS	  = $(EXTRA_DSO_LIBS)       \
+LIBS	  = $(LIBS_DIR) \
 			$(MOZ_UNICHARUTIL_LIBS)	\
-			$(XPCOM_LIBS)			\
 			$(NSPR_LIBS)			\
 			$(MOZ_JS_LIBS)			\
 			$(NULL)
diff --git a/minimo/base/linux/minimo-link-libs b/minimo/base/linux/minimo-link-libs
index 5087f72468d..f585400330b 100755
--- a/minimo/base/linux/minimo-link-libs
+++ b/minimo/base/linux/minimo-link-libs
@@ -3,3 +3,7 @@ ucvutil_s
 gtkxtbin
 gfxshared_s
 gkgfx
+xpcom_core
+xpcomglue
+embed_base_s
+profdirserviceprovider_s
diff --git a/minimo/base/wince/minimo-link-libs b/minimo/base/wince/minimo-link-libs
index 0106bcd6639..011cc28391e 100755
--- a/minimo/base/wince/minimo-link-libs
+++ b/minimo/base/wince/minimo-link-libs
@@ -1,3 +1,7 @@
 ucvutil_s
 gfxshared_s
 gkgfx
+xpcom_core
+xpcomglue
+embed_base_s
+profdirserviceprovider_s
diff --git a/minimo/config/mozconfig/ppc2003arm b/minimo/config/mozconfig/ppc2003arm
index 3031b4772f4..c2c1b6bfad7 100755
--- a/minimo/config/mozconfig/ppc2003arm
+++ b/minimo/config/mozconfig/ppc2003arm
@@ -26,7 +26,7 @@ mk_add_options TARGET_DEVICE=device
 # code generation options (optimize for size)
 ac_add_options --enable-strip
 ac_add_options --disable-debug
-ac_add_options --enable-optimize="-Os -Og"
+ac_add_options --enable-optimize="-Oxs"
 
 # enable static build
 ac_add_options --disable-shared
diff --git a/minimo/config/wince/minimo.inf b/minimo/config/wince/minimo.inf
index 4eae7f58dc2..4810aecd24f 100755
--- a/minimo/config/wince/minimo.inf
+++ b/minimo/config/wince/minimo.inf
@@ -36,8 +36,6 @@ plds4.dll=1
 shunt.dll=1
 softokn3.dll=1
 ssl3.dll=1
-xpcom.dll=1
-xpcom_core.dll=1
 
 classic.jar=2
 classic.manifest=2
@@ -107,8 +105,6 @@ plds4.dll,,,0
 shunt.dll,,,0
 softokn3.dll,,,0
 ssl3.dll,,,0
-xpcom.dll,,,0
-xpcom_core.dll,,,0
 
 [Files.chrome]
 classic.jar,,,0
diff --git a/minimo/config/wince/minimo_installer.ini b/minimo/config/wince/minimo_installer.ini
index e14034205b5..fba6a50c6b5 100755
--- a/minimo/config/wince/minimo_installer.ini
+++ b/minimo/config/wince/minimo_installer.ini
@@ -5,6 +5,6 @@ Component = Minimo
 [Minimo]
 CabFiles = minimo.2577.CAB
 Description=Mozilla Minimo for CE devices
-Uninstall=Mozilla Minimo 009
+Uninstall=Mozilla Minimo 010
 IconFile = minimo.ico
 IconIndex=0
diff --git a/minimo/config/wince_package.sh b/minimo/config/wince_package.sh
index d1944414972..36e2553d197 100755
--- a/minimo/config/wince_package.sh
+++ b/minimo/config/wince_package.sh
@@ -27,8 +27,6 @@ cp -a bin/minimo_runner.exe                              minimo
 cp -a bin/nspr4.dll                                      minimo
 cp -a bin/plc4.dll                                       minimo
 cp -a bin/plds4.dll                                      minimo
-cp -a bin/xpcom.dll                                      minimo
-cp -a bin/xpcom_core.dll                                 minimo
 
 cp -a bin/nss3.dll                                       minimo
 cp -a bin/nssckbi.dll                                    minimo
@@ -56,14 +54,6 @@ cp -a bin/components/nsDictionary.js                     minimo/components
 cp -a bin/components/nsInterfaceInfoToIDL.js             minimo/components
 cp -a bin/components/nsXmlRpcClient.js                   minimo/components
 
-cp -a bin/components/pipboot.dll                         minimo/components
-cp -a bin/components/pipnss.dll                          minimo/components
-
-cp -a bin/components/t8iix.dll                           minimo/components
-cp -a bin/components/websrvcs.dll                        minimo/components
-cp -a bin/components/xmlextra.dll                        minimo/components
-cp -a bin/components/gkplugin.dll                        minimo/components
-
 cp -a bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components
 
 mkdir -p minimo/greprefs
diff --git a/minimo/customization/all.js b/minimo/customization/all.js
index d08ad73ee96..93bdac4f0d8 100755
--- a/minimo/customization/all.js
+++ b/minimo/customization/all.js
@@ -1,4 +1,4 @@
-pref("general.useragent.extra.minimo", "Minimo/0.009");
+("general.useragent.extra.minimo", "Minimo/0.010");
 
 pref("browser.cache.disk.enable",           false);
 pref("browser.cache.disk.capacity",         0);
@@ -637,7 +637,7 @@ pref("ssr.site.enabled", true);
 
 pref("skey.enabled", true);
 
-pref("browser.startup.homepage", "http://www.google.com/xhtml");
+pref("browser.startup.homepage", "http://www.meer.net/~dougt/minimo_ce/start.html");
 
 pref("browser.display.zoomui",10);
 pref("browser.display.zoomcontent",10);
@@ -645,3 +645,12 @@ pref("browser.display.zoomcontent",10);
 /* So forcing this to false, so it's possible to test the toggle */ 
 /* This is being used in the code, as the state holder */ 
 pref("snav.enabled", false);
+
+pref("browser.formfill.enable", true);
+
+
+/* These are opts. for slower devices */
+pref("content.max.tokenizing.time", 2250000);
+pref("content.notify.interval", 750000);
+pref("content.switch.threshold", 750000);
+pref("nglayout.initialpaint.delay", 750);