diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
index 4743ea0ab..594c1a396 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/Makefile
@@ -60,115 +60,114 @@ install:
 	install -m644 artwork/ksplash/*  "$(KSPLASH_THEME_DIR)"
 	ln -s /usr/share/wallpapers/kubuntu-wallpaper.jpg "$(KSPLASH_THEME_DIR)/Background.jpg"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
-	install -m644 artwork/metabar/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
+	install -m644 artwork/metabar/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
-	install -m644 artwork/amarok/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
+	install -m644 artwork/amarok/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
-	install -m644 artwork/konversation/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
+	install -m644 artwork/konversation/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
 
 	mkdir -p "$(DESTDIR)/etc"
-	install -m644 kde-profile/kderc "$(DESTDIR)/etc"
-	install -m644 kde-profile/kde4rc "$(DESTDIR)/etc"
-	install -m644 kde-profile/kde-user-profile "$(DESTDIR)/etc"
+	install -m644 tde-profile/tderc "$(DESTDIR)/etc"
+	install -m644 tde-profile/kde4rc "$(DESTDIR)/etc"
+	install -m644 tde-profile/tde-user-profile "$(DESTDIR)/etc"
 
 	mkdir -p "$(DESTDIR)/etc/qt3"
 	install -m644 qt-rc-files/*rc "$(DESTDIR)/etc/qt3"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/kde-profile/default/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/tde-profile/default/share/config/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
-	install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
+	install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
 
 	mkdir -p "$(CURSOR_DIR)/cursors"
 	install -m644 cursors/index.theme "$(CURSOR_DIR)/"
 	mkdir -p "$(CURSOR_DIR)cursors/"
 	install -m644 cursors/contrastlarge/cursors/* "$(CURSOR_DIR)/cursors/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-	install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-#	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-#	install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
-	install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
-	install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+	install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+#	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+#	install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+	install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
+	install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/servicemenus/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/servicemenus/"
 	mkdir -p "$(DESTDIR)/usr/bin"
-	install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
+	install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
-	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
-	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
-	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
-	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
+	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/"
-	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/"
-	install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/scalable/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"
+	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/"
+	install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/scalable/actions/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine/"
-	install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine/"
+	install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
-	install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
+	install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
-	install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
+	install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
-	install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
-	install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+	install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+	install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
-	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
+	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
-	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
-	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
+	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
-	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
-	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
-	install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+	install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
 
 	install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde "$(SETTINGS_DIR)/.gtkrc-2.0-kde"
 	install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(SETTINGS_DIR)/gtk-qt-engine.rc.sh"
-	install -m644 hal/hal-policy-ntfs-config-write-policy.fdi "$(SETTINGS_DIR)/hal-policy-ntfs-config-write-policy.fdi"
-
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
-	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
-	cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
-	cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
-	cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/"
-	ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
+
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+	cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+	cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+	cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/"
+	ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
 
 	mkdir -p "$(DESTDIR)/etc/kubuntu-default-settings-trinity"
 	install -m644 kde-hidden/hidden-media "$(DESTDIR)/etc/kubuntu-default-settings-trinity/"
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
index 383dd4be7..a18bff0ca 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/changelog
@@ -1761,7 +1761,7 @@ kubuntu-default-settings (1:5.04-03) hoary; urgency=low
 
 kubuntu-default-settings (1:5.04-02) hoary; urgency=low
 
-  * Move rc files from /etc/kde-profile to /usr/share/kubuntu-default-settings
+  * Move rc files from /etc/tde-profile to /usr/share/kubuntu-default-settings
   * Add kmixrc to hide kmix window by default
 
  -- Jonathan Riddell <jr@jriddell.org>  Wed, 16 Mar 2005 21:52:11 +0000
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
-<!-- file created by ntfs-config -->
-<!-- mount ntfs volume with the ntfs-3g driver to enable write support -->
-
-    <device>
-        <match key="volume.fstype" string="ntfs">
-		    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-			    <merge key="volume.fstype" type="string">ntfs-3g</merge>
-                <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-			    <append key="volume.mount.valid_options" type="strlist">locale=</append>
-	        </match>
-	    </match>
-    </device>
-
-</deviceinfo>
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
-<!-- file created by ntfs-config -->
-<!-- mount ntfs volume with the ntfs-3g driver to enable write support -->
-
-    <device>
-        <match key="volume.fstype" string="ntfs">
-		    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-			    <merge key="volume.fstype" type="string">ntfs-3g</merge>
-                <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-			    <append key="volume.mount.valid_options" type="strlist">locale=</append>
-	        </match>
-	    </match>
-    </device>
-
-</deviceinfo>
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
index d12811dd2..b172909b8 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
@@ -1,4 +1,4 @@
 [Misc]
 startkdeScan=true
 useArtsdsp=true
-PluginsListFile=/usr/share/kubuntu-default-settings-trinity/kde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
+PluginsListFile=/usr/share/kubuntu-default-settings-trinity/tde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
index 280fdc386..14134537d 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
@@ -32,8 +32,8 @@ LogoAlignment=1
 LogoDistance=0
 LogoFile=
 LogoStretch=0
-OverlayFileActive=/usr/share/kubuntu-default-settings-trinity/kde-profile/default/share/apps/kwin/window-decoration-gradient.png
-OverlayFileInactive=/usr/share/kubuntu-default-settings-trinity/kde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png
+OverlayFileActive=/usr/share/kubuntu-default-settings-trinity/tde-profile/default/share/apps/kwin/window-decoration-gradient.png
+OverlayFileInactive=/usr/share/kubuntu-default-settings-trinity/tde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png
 OverlayModeActive=2
 OverlayModeInactive=2
 RepaintMode=3
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
index a7d794744..5afe596ad 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
@@ -1,3 +1,3 @@
 [Misc]
 startkdeScan=true
-PluginsListFile=/usr/share/kubuntu-default-settings-trinity/kde-profile/default/share/apps/konqueror/konq_plugins.xml
+PluginsListFile=/usr/share/kubuntu-default-settings-trinity/tde-profile/default/share/apps/konqueror/konq_plugins.xml
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
similarity index 100%
rename from ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc
rename to ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
similarity index 100%
rename from ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile
rename to ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kderc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tderc
similarity index 57%
rename from ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kderc
rename to ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tderc
index df5ec9dc6..7e4f0424b 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kderc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/tde-profile/tderc
@@ -2,4 +2,4 @@
 userProfileMapFile=/etc/kde-user-profile
 
 [Directories-default]
-prefixes=/usr/share/redmond-default-settings-trinity/kde-profile/default/
+prefixes=/usr/share/kubuntu-default-settings-trinity/tde-profile/default/
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
index 63142dc6b..c18753ef2 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/Makefile
@@ -199,106 +199,105 @@ install:
 	install -m644 artwork/ksplash/*  "$(KSPLASH_THEME_DIR)"
 	ln -s /usr/share/wallpapers/kubuntu-wallpaper.png "$(KSPLASH_THEME_DIR)/Background.jpg"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
-	install -m644 artwork/metabar/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
+	install -m644 artwork/metabar/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
-	install -m644 artwork/amarok/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
+	install -m644 artwork/amarok/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
-	install -m644 artwork/konversation/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
+	install -m644 artwork/konversation/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
 
 	mkdir -p "$(DESTDIR)/etc"
-	install -m644 kde-profile/kderc "$(DESTDIR)/etc"
-	install -m644 kde-profile/kde4rc "$(DESTDIR)/etc"
-	install -m644 kde-profile/kde-user-profile "$(DESTDIR)/etc"
+	install -m644 tde-profile/tderc "$(DESTDIR)/etc"
+	install -m644 tde-profile/kde4rc "$(DESTDIR)/etc"
+	install -m644 tde-profile/tde-user-profile "$(DESTDIR)/etc"
 
 	mkdir -p "$(DESTDIR)/etc/qt3"
 	install -m644 qt-rc-files/*rc "$(DESTDIR)/etc/qt3"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/startupconfig "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/kde-profile/default/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/startupconfig "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/tde-profile/default/share/config/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
-	install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
+	install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
 
 	mkdir -p "$(CURSOR_DIR)/cursors"
 	install -m644 cursors/index.theme "$(CURSOR_DIR)/"
 	mkdir -p "$(CURSOR_DIR)cursors/"
 	install -m644 cursors/contrastlarge/cursors/* "$(CURSOR_DIR)/cursors/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-	install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-#	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-#	install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
-	install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
-	install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+	install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+#	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+#	install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+	install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
+	install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/servicemenus/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/servicemenus/"
 	mkdir -p "$(DESTDIR)/usr/bin"
-	install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
+	install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
-	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
-	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
-	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
-	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
+	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/"
-	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/"
-	install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/scalable/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"
+	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/"
+	install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/scalable/actions/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine/"
-	install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine/"
+	install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
-	install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
+	install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
-	install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
+	install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
-	install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
-	install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+	install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+	install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
-	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
+	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
-	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
-	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
+	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
-	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
-	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
-	install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+	install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
 
 	install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(SETTINGS_DIR)/.gtkrc-2.0-kde4"
 	install -m644 gtk-qt-engine-rc-files/gtk_qt_engine_rc "$(SETTINGS_DIR)/.gtk_qt_engine_rc"
 	install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(SETTINGS_DIR)/gtk-qt-engine.rc.sh"
-#	install -m644 hal/hal-policy-ntfs-config-write-policy.fdi "$(SETTINGS_DIR)/hal-policy-ntfs-config-write-policy.fdi"
 
 	mkdir -p "$(DESTDIR)/etc/skel"
 	install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(DESTDIR)/etc/skel/.gtkrc-2.0-kde4"
@@ -315,16 +314,16 @@ install:
 	mkdir -p "$(KDESKEL_DIR)/share/apps/kdesktop"
 	install -m644 default-icon-positions/IconPositions "$(KDESKEL_DIR)/share/apps/kdesktop/IconPositions"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
-	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
-	cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
-	cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
-	cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/"
-	ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+	cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+	cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+	cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/"
+	ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
 
 	mkdir -p "$(DESTDIR)/etc/redmond-default-settings"
 	install -m644 kde-hidden/hidden-media "$(DESTDIR)/etc/redmond-default-settings/"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/backgroundrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/backgroundrc
index e52cd6221..ae6e5fcf3 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/backgroundrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/backgroundrc
@@ -3,7 +3,7 @@ BackgroundMode=Flat
 BlendBalance=100
 BlendMode=NoBlending
 ChangeInterval=60
-Color1=0,0,0
+Color1=58,110,165
 Color2=192,192,192
 CurrentWallpaperName=
 LastChange=0
@@ -15,7 +15,7 @@ ReverseBlending=false
 UseSHM=false
 Wallpaper=/usr/share/wallpapers/enterprise-desktop.png
 WallpaperList=
-WallpaperMode=Scaled
+WallpaperMode=NoWallpaper
 
 [X-*-Greeter]
 Compositor=kompmgr
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
-<!-- file created by ntfs-config -->
-<!-- mount ntfs volume with the ntfs-3g driver to enable write support -->
-
-    <device>
-        <match key="volume.fstype" string="ntfs">
-		    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-			    <merge key="volume.fstype" type="string">ntfs-3g</merge>
-                <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-			    <append key="volume.mount.valid_options" type="strlist">locale=</append>
-	        </match>
-	    </match>
-    </device>
-
-</deviceinfo>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
-<!-- file created by ntfs-config -->
-<!-- mount ntfs volume with the ntfs-3g driver to enable write support -->
-
-    <device>
-        <match key="volume.fstype" string="ntfs">
-		    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-			    <merge key="volume.fstype" type="string">ntfs-3g</merge>
-                <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-			    <append key="volume.mount.valid_options" type="strlist">locale=</append>
-	        </match>
-	    </match>
-    </device>
-
-</deviceinfo>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
index 54d5dc921..dd67afa35 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
@@ -1,4 +1,4 @@
 [Misc]
 startkdeScan=true
 useArtsdsp=true
-PluginsListFile=/usr/share/redmond-default-settings/kde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
+PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
index 3368a104a..e86bdc2e0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
@@ -32,8 +32,8 @@ LogoAlignment=1
 LogoDistance=0
 LogoFile=
 LogoStretch=0
-OverlayFileActive=/usr/share/redmond-default-settings/kde-profile/default/share/apps/kwin/window-decoration-gradient.png
-OverlayFileInactive=/usr/share/redmond-default-settings/kde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png
+OverlayFileActive=/usr/share/redmond-default-settings/tde-profile/default/share/apps/kwin/window-decoration-gradient.png
+OverlayFileInactive=/usr/share/redmond-default-settings/tde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png
 OverlayModeActive=2
 OverlayModeInactive=2
 RepaintMode=3
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
index 897bed37a..a6f9f10fd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
@@ -1,3 +1,3 @@
 [Misc]
 startkdeScan=true
-PluginsListFile=/usr/share/redmond-default-settings/kde-profile/default/share/apps/konqueror/konq_plugins.xml
+PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
similarity index 100%
rename from ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc
rename to ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
similarity index 100%
rename from ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile
rename to ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kderc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
similarity index 57%
rename from ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kderc
rename to ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
index df5ec9dc6..f6a7decc9 100755
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kderc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
@@ -2,4 +2,4 @@
 userProfileMapFile=/etc/kde-user-profile
 
 [Directories-default]
-prefixes=/usr/share/redmond-default-settings-trinity/kde-profile/default/
+prefixes=/usr/share/redmond-default-settings-trinity/tde-profile/default/
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc
index 21aee497f..006b74dcc 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/tdmdistrc
@@ -316,7 +316,7 @@ UseSAK=true
 # "Logo" - the image specified by LogoPixmap
 # "Clock" - a neat analog clock
 # Default is Clock
-LogoArea=Logo
+LogoArea=None
 # The image to show when LogoArea=Logo.
 # Default is ""
 LogoPixmap=/opt/trinity/share/apps/tdm/pics/kdelogo.png
@@ -365,7 +365,7 @@ AntiAliasing=true
 #UserCompletion=true
 # Enable user list (names along with images) in the greeter.
 # Default is true
-#UserList=false
+UserList=false
 # User selection for UserCompletion and UserList:
 # "NotHidden" - all users except those listed in HiddenUsers
 # "Selected" - only the users listed in SelectedUsers
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
index 285e2be3d..6268b91c7 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/Makefile
@@ -198,106 +198,105 @@ install:
 	install -m644 artwork/ksplash/*  "$(KSPLASH_THEME_DIR)"
 	ln -s /usr/share/wallpapers/kubuntu-wallpaper.png "$(KSPLASH_THEME_DIR)/Background.jpg"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
-	install -m644 artwork/metabar/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/metabar/themes/kubuntu"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
+	install -m644 artwork/metabar/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/metabar/themes/kubuntu"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
-	install -m644 artwork/amarok/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/amarok/themes/kubuntu"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
+	install -m644 artwork/amarok/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/amarok/themes/kubuntu"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
-	install -m644 artwork/konversation/*  "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/themes/oxygen"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
+	install -m644 artwork/konversation/*  "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/themes/oxygen"
 
 	mkdir -p "$(DESTDIR)/etc"
-	install -m644 kde-profile/kderc "$(DESTDIR)/etc"
-	install -m644 kde-profile/kde4rc "$(DESTDIR)/etc"
-	install -m644 kde-profile/kde-user-profile "$(DESTDIR)/etc"
+	install -m644 tde-profile/tderc "$(DESTDIR)/etc"
+	install -m644 tde-profile/kde4rc "$(DESTDIR)/etc"
+	install -m644 tde-profile/tde-user-profile "$(DESTDIR)/etc"
 
 	mkdir -p "$(DESTDIR)/etc/qt3"
 	install -m644 qt-rc-files/*rc "$(DESTDIR)/etc/qt3"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/startupconfig "$(SETTINGS_DIR)/kde-profile/default/share/config/"
-	install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/kde-profile/default/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/*rc "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/uiserver "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/kdeglobals "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/startupconfig "$(SETTINGS_DIR)/tde-profile/default/share/config/"
+	install -m644 kde-rc-files/cryptodefaults "$(SETTINGS_DIR)/tde-profile/default/share/config/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
-	install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdedisplay/color-schemes/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
+	install -m644 colour-schemes/*rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdedisplay/color-schemes/"
 
 	mkdir -p "$(CURSOR_DIR)/cursors"
 	install -m644 cursors/index.theme "$(CURSOR_DIR)/"
 	mkdir -p "$(CURSOR_DIR)cursors/"
 	install -m644 cursors/contrastlarge/cursors/* "$(CURSOR_DIR)/cursors/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-	install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
-#	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-#	install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konversation/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
-	install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kopete/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
-	install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gwenview/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+	install -m644 ui-rc-files/konqueror.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
+#	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+#	install -m644 ui-rc-files/konversationui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konversation/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+	install -m644 ui-rc-files/kopetechatwindow.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kopete/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
+	install -m644 ui-rc-files/gwenviewui.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gwenview/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/servicemenus/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/servicemenus/"
 	mkdir -p "$(DESTDIR)/usr/bin"
-	install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqueror/"
+	install -m644 konqueror-profile/konq_plugins.xml "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqueror/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
-	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/16x16/actions/"
-	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/22x22/actions/"
-	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/32x32/actions/"
-	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/48x48/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
+	install -m644 artwork/throbber/16x16/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/16x16/actions/"
+	install -m644 artwork/throbber/22x22/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/22x22/actions/"
+	install -m644 artwork/throbber/32x32/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/32x32/actions/"
+	install -m644 artwork/throbber/48x48/kde.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/48x48/actions/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/"
-	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/"
-	install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/icons/crystalsvg/scalable/actions/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/"
+	install -m644 kaffeine/fileopen64.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/64x64/actions/fileopen.png"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/"
+	install -m644 kaffeine/fileopen128.png "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/128x128/actions/fileopen.png"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/icons/crystalsvg/scalable/actions/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine/"
-	install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/kde-profile/default/share/apps/kaffeine"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine/"
+	install -m644 kaffeine/wizard_stamp_v0.7.1 "$(SETTINGS_DIR)/tde-profile/default/share/apps/kaffeine"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
-	install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/kpdfpart/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
+	install -m644 kpart-rc-files/part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/kpdfpart/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
-	install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/gvimagepart/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
+	install -m644 kpart-rc-files/gvimagepart.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/gvimagepart/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
-	install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
-	install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ark/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+	install -m644 kpart-rc-files/ark_part.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
+	install -m644 kpart-rc-files/ark_part_readonly.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ark/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
-	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/ksvg/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
+	install -m644 kpart-rc-files/ksvgplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/ksvg/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
-	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdehtml/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
+	install -m644 kpart-rc-files/tdehtml_browser.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdehtml/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
-	install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/kde-profile/default/share/mimelnk/application/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tar.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tarz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tbz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-tgz.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
+	install -m644 mimelnk/x-zip.desktop "$(SETTINGS_DIR)/tde-profile/default/share/mimelnk/application/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
-	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/kde-profile/default/share/apps/konqiconview/kpartplugins/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
+	install -m644 kpart-plugins/dirfilterplugin.rc "$(SETTINGS_DIR)/tde-profile/default/share/apps/konqiconview/kpartplugins/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
-	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/kde-profile/default/share/apps/tdewallet/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
+	install -m644 tdewallet-default-wallet/kdewallet.kwl "$(SETTINGS_DIR)/tde-profile/default/share/apps/tdewallet/"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
-	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
-	install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/kde-profile/default/share/apps/kwin/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+	install -m644 artwork/window-decoration-gradient.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
+	install -m644 artwork/window-decoration-gradient-inactive.png "$(SETTINGS_DIR)/tde-profile/default/share/apps/kwin/"
 
 	install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(SETTINGS_DIR)/.gtkrc-2.0-kde4"
 	install -m644 gtk-qt-engine-rc-files/gtk_qt_engine_rc "$(SETTINGS_DIR)/.gtk_qt_engine_rc"
 	install -m644 gtk-qt-engine-rc-files/gtk-qt-engine.rc.sh "$(SETTINGS_DIR)/gtk-qt-engine.rc.sh"
-#	install -m644 hal/hal-policy-ntfs-config-write-policy.fdi "$(SETTINGS_DIR)/hal-policy-ntfs-config-write-policy.fdi"
 
 	mkdir -p "$(DESTDIR)/etc/skel"
 	install -m644 gtk-qt-engine-rc-files/gtkrc-2.0-kde4 "$(DESTDIR)/etc/skel/.gtkrc-2.0-kde4"
@@ -310,16 +309,16 @@ install:
 	mkdir -p "$(KDESKEL_DIR)/share/apps/kdesktop"
 	install -m644 default-icon-positions/IconPositions "$(KDESKEL_DIR)/share/apps/kdesktop/IconPositions"
 
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
-	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/lesser-visual-impairment/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
-	cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/kde-profile/moderate-visual-impairment/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
-	cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/kde-profile/minor-motor-difficulties/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
-	cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/config/"
-	mkdir -p "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/"
-	ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/kde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+	cp -r accessibility/lesser-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/lesser-visual-impairment/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+	cp -r accessibility/moderate-visual-impairment/* "$(SETTINGS_DIR)/tde-profile/moderate-visual-impairment/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+	cp -r accessibility/minor-motor-difficulties/* "$(SETTINGS_DIR)/tde-profile/minor-motor-difficulties/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+	cp -r accessibility/motor-difficulties-pointing-devices/* "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/config/"
+	mkdir -p "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/"
+	ln -s /usr/bin/kmousetool "$(SETTINGS_DIR)/tde-profile/motor-difficulties-pointing-devices/share/Autostart/kmousetool"
 
 	mkdir -p "$(DESTDIR)/etc/redmond-default-settings"
 	install -m644 kde-hidden/hidden-media "$(DESTDIR)/etc/redmond-default-settings/"
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi b/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
-<!-- file created by ntfs-config -->
-<!-- mount ntfs volume with the ntfs-3g driver to enable write support -->
-
-    <device>
-        <match key="volume.fstype" string="ntfs">
-		    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-			    <merge key="volume.fstype" type="string">ntfs-3g</merge>
-                <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-			    <append key="volume.mount.valid_options" type="strlist">locale=</append>
-	        </match>
-	    </match>
-    </device>
-
-</deviceinfo>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- -->
-
-<deviceinfo version="0.2">
-
-<!-- file created by ntfs-config -->
-<!-- mount ntfs volume with the ntfs-3g driver to enable write support -->
-
-    <device>
-        <match key="volume.fstype" string="ntfs">
-		    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-			    <merge key="volume.fstype" type="string">ntfs-3g</merge>
-                <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
-			    <append key="volume.mount.valid_options" type="strlist">locale=</append>
-	        </match>
-	    </match>
-    </device>
-
-</deviceinfo>
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
index 54d5dc921..dd67afa35 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
@@ -1,4 +1,4 @@
 [Misc]
 startkdeScan=true
 useArtsdsp=true
-PluginsListFile=/usr/share/redmond-default-settings/kde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
+PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml
\ No newline at end of file
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
index 3368a104a..e86bdc2e0 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
@@ -32,8 +32,8 @@ LogoAlignment=1
 LogoDistance=0
 LogoFile=
 LogoStretch=0
-OverlayFileActive=/usr/share/redmond-default-settings/kde-profile/default/share/apps/kwin/window-decoration-gradient.png
-OverlayFileInactive=/usr/share/redmond-default-settings/kde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png
+OverlayFileActive=/usr/share/redmond-default-settings/tde-profile/default/share/apps/kwin/window-decoration-gradient.png
+OverlayFileInactive=/usr/share/redmond-default-settings/tde-profile/default/share/apps/kwin/window-decoration-gradient-inactive.png
 OverlayModeActive=2
 OverlayModeInactive=2
 RepaintMode=3
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
index 897bed37a..a6f9f10fd 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
@@ -1,3 +1,3 @@
 [Misc]
 startkdeScan=true
-PluginsListFile=/usr/share/redmond-default-settings/kde-profile/default/share/apps/konqueror/konq_plugins.xml
+PluginsListFile=/usr/share/redmond-default-settings/tde-profile/default/share/apps/konqueror/konq_plugins.xml
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde4rc b/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/kde4rc
similarity index 100%
rename from ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde4rc
rename to ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile b/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
similarity index 100%
rename from ubuntu/maverick/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile
rename to ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kderc b/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tderc
similarity index 57%
rename from ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kderc
rename to ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tderc
index c2f5a61e6..f6a7decc9 100755
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-profile/kderc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/tde-profile/tderc
@@ -2,4 +2,4 @@
 userProfileMapFile=/etc/kde-user-profile
 
 [Directories-default]
-prefixes=/usr/share/kubuntu-default-settings-trinity/kde-profile/default/
+prefixes=/usr/share/redmond-default-settings-trinity/tde-profile/default/