diff --git a/embedding/minimo/wince/minimo-link-comps b/embedding/minimo/wince/minimo-link-comps
index a85b7e63678..361238a5e61 100755
--- a/embedding/minimo/wince/minimo-link-comps
+++ b/embedding/minimo/wince/minimo-link-comps
@@ -19,6 +19,7 @@ txmgr
 appshell
 chrome
 mork
+tkitcmps
 xmlextra
 t8iix
 websrvcs
diff --git a/embedding/minimo/wince/minimo-link-names b/embedding/minimo/wince/minimo-link-names
index dcb2587b146..3582488e69d 100755
--- a/embedding/minimo/wince/minimo-link-names
+++ b/embedding/minimo/wince/minimo-link-names
@@ -20,6 +20,7 @@ nsTransactionManagerModule
 appshell
 nsChromeModule
 nsMorkModule
+nsToolkitCompsModule
 nsXMLExtrasModule
 TransformiixModule
 nsWebServicesModule
diff --git a/embedding/minimo/wince/mozconfig/ppc2003arm b/embedding/minimo/wince/mozconfig/ppc2003arm
index e2945a46466..e9a877df14b 100755
--- a/embedding/minimo/wince/mozconfig/ppc2003arm
+++ b/embedding/minimo/wince/mozconfig/ppc2003arm
@@ -1,8 +1,8 @@
 mk_add_options NSPR_CO_TAG=NSPRPUB_PRE_4_2_WINCE_BRANCH
 mk_add_options NSS_CO_TAG=NSS_WINCE_CLIENT_TAG
 
-mk_add_options MOZ_CO_PROJECT=suite
-ac_add_options --enable-application=suite
+mk_add_options MOZ_CO_PROJECT=minimo
+ac_add_options --enable-application=minimo
 
 CROSS_COMPILE=1
 
@@ -17,54 +17,12 @@ ac_add_options --target=arm-wince
 ac_add_options --enable-win32-target=WINCE
 ac_add_options --enable-default-toolkit=windows
 
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-ac_add_options --disable-oji
-
 WINCE=1
 mk_add_options WINCE=1
 
 TARGET_DEVICE=device
 mk_add_options TARGET_DEVICE=device
 
-MINIMO=1
-mk_add_options MINIMO=1
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-# disable features and skip various build steps
-ac_add_options --enable-extensions="xml-rpc xmlextras transformiix webservices spatialnavigation"
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xpinstall
-ac_add_options --disable-xpfe-components
-ac_add_options --disable-necko-disk-cache
-ac_add_options --disable-updater
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-tests
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=about,data,http,file,res,jar
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
 # code generation options (optimize for size)
 ac_add_options --enable-strip
 ac_add_options --disable-debug
@@ -75,5 +33,3 @@ ac_add_options --disable-shared
 ac_add_options --enable-static
 
 # ac_add_options --enable-timeline
-
-ac_add_options --disable-v1-string-abi
diff --git a/embedding/minimo/wince/mozconfig/ppc2003emu b/embedding/minimo/wince/mozconfig/ppc2003emu
index fc5f8a85a6d..e69de29bb2d 100755
--- a/embedding/minimo/wince/mozconfig/ppc2003emu
+++ b/embedding/minimo/wince/mozconfig/ppc2003emu
@@ -1,82 +0,0 @@
-mk_add_options NSPR_CO_TAG=NSPRPUB_PRE_4_2_WINCE_BRANCH
-mk_add_options NSS_CO_TAG=NSS_WINCE_CLIENT_TAG
-
-mk_add_options MOZ_CO_PROJECT=suite
-ac_add_options --enable-application=suite
-
-CROSS_COMPILE=1
-
-CXX=arm-wince-gcc
-LD=arm-wince-link
-AR=arm-wince-lib
-mk_add_options AR=arm-wince-lib
-
-AS=arm-wince-as
-
-ac_add_options --target=arm-wince
-ac_add_options --enable-win32-target=WINCE
-ac_add_options --enable-default-toolkit=windows
-
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-ac_add_options --disable-oji
-
-WINCE=1
-mk_add_options WINCE=1
-
-TARGET_DEVICE=emulator
-mk_add_options TARGET_DEVICE=emulator
-
-MINIMO=1
-mk_add_options MINIMO=1
-
-# enable minimal profile support
-ac_add_options --disable-profilesharing
-ac_add_options --disable-profilelocking
-ac_add_options --enable-single-profile
-
-# disable features and skip various build steps
-ac_add_options --enable-extensions="xml-rpc xmlextras transformiix webservices spatialnavigation"
-ac_add_options --disable-accessibility
-ac_add_options --disable-composer
-ac_add_options --enable-plaintext-editor-only
-ac_add_options --disable-mailnews
-ac_add_options --disable-ldap	
-ac_add_options --disable-postscript
-ac_add_options --disable-mathml
-ac_add_options --disable-jsd
-ac_add_options --disable-installer
-ac_add_options --disable-xpinstall
-ac_add_options --disable-xpfe-components
-ac_add_options --disable-necko-disk-cache
-ac_add_options --disable-updater
-
-# configure necko to allocate smaller network buffers
-ac_add_options --enable-necko-small-buffers
-
-# disable debug logging and tests
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-logging
-ac_add_options --disable-tests
-
-# build minimal set of protocol handlers
-ac_add_options --enable-necko-protocols=about,data,http,file,res,jar
-
-# build minimal set of image decoders
-ac_add_options --enable-image-decoders=png,gif,jpeg
-
-# code generation options (optimize for size)
-ac_add_options --enable-strip
-ac_add_options --disable-debug
-
-#ac_add_options --disable-optimize
-#ac_add_options --enable-debug
-
-# enable static build
-ac_add_options --disable-shared
-ac_add_options --enable-static
-
-#xptcall busted
-ac_add_options --disable-jsloader
-
-ac_add_options --disable-v1-string-abi
diff --git a/embedding/minimo/wince/package.sh b/embedding/minimo/wince/package.sh
index 5389ac0c446..45dc2032917 100755
--- a/embedding/minimo/wince/package.sh
+++ b/embedding/minimo/wince/package.sh
@@ -30,14 +30,23 @@ cp -a bin/ssl3.dll                                       wince
 
 
 mkdir -p wince/chrome
+
 cp -a bin/chrome/classic.jar                             wince/chrome
+cp -a bin/chrome/classic.manifest                        wince/chrome
+
 cp -a bin/chrome/en-US.jar                               wince/chrome
-cp -a bin/chrome/installed-chrome.txt                    wince/chrome
+cp -a bin/chrome/en-US.manifest                          wince/chrome
+
 cp -a bin/chrome/minimo.jar                              wince/chrome
+
 cp -a bin/chrome/toolkit.jar                             wince/chrome
+cp -a bin/chrome/toolkit.manifest                        wince/chrome
 
 cp -a bin/chrome/pippki.jar                              wince/chrome
-cp -a bin/chrome/pipnss.jar                              wince/chrome
+cp -a bin/chrome/pippki.manifest                         wince/chrome
+
+cp -a bin/chrome/installed-chrome.txt                    wince/chrome
+
 
 mkdir -p wince/components
 
@@ -52,6 +61,7 @@ cp -a bin/components/pipboot.dll                         wince/components
 cp -a bin/components/pipnss.dll                          wince/components
 cp -a bin/components/pippki.dll                          wince/components
 
+cp -a bin/extensions/spatial-navigation@extensions.mozilla.org/components/* wince/components
 
 mkdir -p wince/greprefs
 cp -a bin/greprefs/*                                     wince/greprefs
@@ -65,7 +75,7 @@ mkdir -p wince/plugins
 
 echo Linking XPT files.
 
-host/bin/host_xpt_link wince/components/all.xpt                        bin/components/*.xpt
+host/bin/host_xpt_link wince/components/all.xpt          bin/components/*.xpt
 
 echo Chewing on chrome
 
diff --git a/embedding/minimo/wince/winEmbed.cpp b/embedding/minimo/wince/winEmbed.cpp
index e9e82d18433..0d6c4357661 100755
--- a/embedding/minimo/wince/winEmbed.cpp
+++ b/embedding/minimo/wince/winEmbed.cpp
@@ -37,7 +37,7 @@
 #include "MinimoPrivate.h"
 
 #ifdef _BUILD_STATIC_BIN
-#include "nsStaticComponents.h"
+#include "nsStaticComponents.h"
 #endif
 
 // Global variables
@@ -157,7 +157,7 @@ nsresult StartupProfile()
 	return locProvider->SetProfileDir(localAppDataDir);   
 }
 
-void SetPreferences()
+void DoPreferences()
 {
     nsCOMPtr<nsIPrefBranch> prefBranch = do_GetService(NS_PREFSERVICE_CONTRACTID);
     if (!prefBranch)
@@ -228,7 +228,7 @@ int main(int argc, char *argv[])
     if (NS_FAILED(StartupProfile()))
         return 1;
     
-    SetPreferences();
+    DoPreferences();
 
     NS_TIMELINE_ENTER("appStartup");
     nsCOMPtr<nsIAppShell> appShell = do_CreateInstance(kAppShellCID);