Fix omitted renaming and cleanup on Ubuntu Raring

58 files changed, 338 insertions, 1389 deletions

diff --git a/ubuntu/raring/applications/k9copy/debian/control b/ubuntu/raring/applications/k9copy/debian/control
index f7d7c6168..d9a4ccd4e 100644
--- a/ubuntu/raring/applications/k9copy/debian/control
+++ b/ubuntu/raring/applications/k9copy/debian/control
@@ -3,9 +3,8 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Anthony Mercatante <tonio@ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libhal-dev, libhal-storage-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 5), cdbs, tdelibs4-trinity-dev, docbook2x, libdvdread-dev, libdbus-1-dev, libk3b-trinity-dev, libavformat-dev, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
-Homepage: http://k9copy.sourceforge.net/
 
 Package: k9copy-trinity
 Architecture: any
@@ -14,6 +13,6 @@ Replaces: k9copy-kde3 (<< 4:14.0.0), k9copy-trinity (<< 4:14.0.0)
 Breaks: k9copy-kde3 (<< 4:14.0.0), k9copy-trinity (<< 4:14.0.0)
 Description: DVD backup tool for Trinity
  k9copy is a tabbed tool that allows to copy of one or more titles from a DVD9
- to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
+ to a DVD5, in much the same way as DVDShrink for Microsoft Windows (R).
  This is the Trinity version
 
diff --git a/ubuntu/raring/applications/k9copy/debian/rules b/ubuntu/raring/applications/k9copy/debian/rules
index 5f97b6de2..8afe2157c 100755
--- a/ubuntu/raring/applications/k9copy/debian/rules
+++ b/ubuntu/raring/applications/k9copy/debian/rules
@@ -13,7 +13,7 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_INSTALL_MANPAGES_k9copy = k9copy-trinity.1
 
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --includedir="/opt/trinity/include/tde" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info" --enable-k3bdevices
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile b/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile
index a8506f339..ea9d69b19 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/Makefile
+++ b/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/entries b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/entries
deleted file mode 100644
index 4901a8e82..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/entries
+++ /dev/null
@@ -1,436 +0,0 @@
-10
-
-dir
-1175792
-svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase/kdm/kfrontend/themes/o2_enterprise
-svn://anonsvn.kde.org/home/kde
-
-
-
-2010-09-09T20:55:54.847511Z
-1173617
-tpearson
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-
-enterprise.xml
-file
-
-
-
-
-2010-09-09T20:06:22.327214Z
-370bbcd4e423c4a5b03b64a3e956b006
-2010-09-09T19:37:03.247644Z
-1173589
-tpearson
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-3353
-
-system_normal.png
-file
-
-
-
-
-2010-09-09T02:59:42.185974Z
-27bd83b6a3516530761e33c1f935b510
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1623
-
-GdmGreeterTheme.desktop
-file
-
-
-
-
-2010-09-09T02:59:42.185974Z
-98aa092a5700ee45b58c4e63a8ff4b25
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-339
-
-gpl.txt
-file
-
-
-
-
-2010-09-09T02:59:42.185974Z
-ebf4e8b49780ab187d51bd26aaa022c6
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-18013
-
-Dialog.png
-file
-
-
-
-
-2010-09-09T20:06:22.327214Z
-f83758de1d38488e0b90c87e8e7bf663
-2010-09-09T19:37:03.247644Z
-1173589
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-5098
-
-system_over.png
-file
-
-
-
-
-2010-09-09T02:59:42.185974Z
-9d5b9792dd41fa5a8783a332d1213cb7
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2491
-
-preview.png
-file
-
-
-
-
-2010-09-09T02:59:42.185974Z
-fa083d25704972b48c4f9f4339d55cd3
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-381843
-
-enter_pressed.png
-file
-
-
-
-
-2010-09-09T02:59:42.195979Z
-561ab9e91f25929a1711875db4a03437
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1639
-
-enter_normal.png
-file
-
-
-
-
-2010-09-09T02:59:42.195979Z
-561ab9e91f25929a1711875db4a03437
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1639
-
-Makefile.am
-file
-
-
-
-
-2010-09-09T20:56:03.386800Z
-1c49666a4126500c54e82aba03ad1b66
-2010-09-09T20:55:54.847511Z
-1173617
-tpearson
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-311
-
-enter_over.png
-file
-
-
-
-
-2010-09-09T02:59:42.195979Z
-315e1c23511cbb52726a6f90799fafa8
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-2422
-
-system_pressed.png
-file
-
-
-
-
-2010-09-09T02:59:42.195979Z
-27bd83b6a3516530761e33c1f935b510
-2010-09-08T18:25:10.734860Z
-1173141
-tpearson
-has-props
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-1623
-
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/Dialog.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/Dialog.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/Dialog.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_normal.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_normal.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_normal.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_over.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_over.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_over.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_pressed.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_pressed.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/enter_pressed.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/preview.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/preview.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/preview.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_normal.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_normal.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_normal.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_over.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_over.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_over.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_pressed.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_pressed.png.svn-base
deleted file mode 100644
index 5e9587e65..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/prop-base/system_pressed.png.svn-base
+++ /dev/null
@@ -1,5 +0,0 @@
-K 13
-svn:mime-type
-V 24
-application/octet-stream
-END
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/Dialog.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/Dialog.png.svn-base
deleted file mode 100644
index 440bf6f43..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/Dialog.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base
deleted file mode 100644
index d50678db4..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/GdmGreeterTheme.desktop.svn-base
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is not really a .desktop file like the rest, but it's useful to treat
-# it as such
-
-[GdmGreeterTheme]
-Encoding=UTF-8
-Greeter=enterprise.xml
-Name=O2 Enterprise
-Description=A sleek and professional looking KDM theme for Trinity
-Author=Ken Wimer (wimer@kde.org) and Timothy Pearson (kb9vqf@pearsoncomputing.net)
-Screenshot=preview.png
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/Makefile.am.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/Makefile.am.svn-base
deleted file mode 100644
index 02b0dee99..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/Makefile.am.svn-base
+++ /dev/null
@@ -1,14 +0,0 @@
-o2_enterprisedir = $(kde_datadir)/kdm/themes/o2_enterprise
-o2_enterprise_DATA = \
-	Dialog.png \
-	enter_normal.png \
-	enter_over.png \
-	enter_pressed.png \
-	enterprise.xml \
-	GdmGreeterTheme.desktop \
-	preview.png \
-	system_normal.png \
-	system_over.png \
-	system_pressed.png
-
-EXTRA_DIST = $(o2_enterprise_DATA)
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_normal.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_normal.png.svn-base
deleted file mode 100644
index c859ce5df..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_normal.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_over.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_over.png.svn-base
deleted file mode 100644
index f1252a55a..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_over.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_pressed.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_pressed.png.svn-base
deleted file mode 100644
index c859ce5df..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enter_pressed.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enterprise.xml.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enterprise.xml.svn-base
deleted file mode 100644
index 42e37f890..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/enterprise.xml.svn-base
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE greeter SYSTEM "greeter.dtd">
-<greeter>
-	<item type="pixmap" >
-		<normal file="@@@KDMBACKGROUND@@@" />
-		<pos width="100%" x="0" y="0" height="100%" />
-	</item>
-	<item type="pixmap" >
-		<normal file="Dialog.png" />
-		<pos width="640" x="50%" y="50%" anchor="c" height="400" />
-		<item type="label" id="clock" >
-			<normal color="#000000" font="Sans 10" />
-				<pos x="435" y="120" anchor="n" />
-			<text>%c</text>
-		</item>
-		<item type="rect">
-			<pos anchor="nw" x="30" y="80" height="243" width="200"/>
-			<fixed>
-				<item type="rect" id="userlist">
-					<pos anchor="c" x="50%" y="50%" height="100%" width="100%"/>
-					<bgmodifier value="32"/>
-				</item>
-			</fixed>
-		</item>
-		<item button="true" type="rect" id="system_button" >
-			<normal alpha="0.0" color="#00ff00" />
-			<pos width="box" x="605" y="315" anchor="c" height="box" />
-			<box xpadding="0" spacing="0" orientation="horizontal" >
-				<item type="pixmap">
-					<pos x="50%" y="50%" anchor="c" />
-					<normal file="system_normal.png" />
-					<prelight file="system_over.png" />
-					<active file="system_pressed.png" />
-				</item>
-			</box>
-		</item>
-		<item button="true" type="rect" id="login_button" >
-			<normal alpha="0.0" color="#00ff00" />
-			<pos width="box" x="540" y="188" anchor="c" height="box" />
-			<box xpadding="0" spacing="0" orientation="horizontal" >
-				<item type="pixmap">
-					<pos x="90%" y="50%" anchor="c" />
-					<normal file="enter_normal.png" />
-					<prelight file="enter_over.png" />
-					<active file="enter_pressed.png" />
-				</item>
-			</box>
-		</item>
-		<box xpadding="20" spacing="10" ypadding="20" orientation="vertical" min-width="340" >
-			<item type="rect" id="talker" >
-				<pos width="box" x="375"  y="140" anchor="n" height="box" />
-				<box xpadding="0" spacing="0" ypadding="0" orientation="horizontal" >
-					<item type="rect" >
-						<normal alpha="0.0" color="#000000" />
-						<pos width="box" y="50%" anchor="w" height="box" />
-						<box xpadding="10" spacing="10" ypadding="0" orientation="vertical" >
-							<item type="label" >
-								<pos x="100%" anchor="ne" />
-								<normal color="#000000" font="Sans Condensed 10" />
-								<stock type="username-label" />
-							</item>
-							<item type="label" >
-								<pos x="100%" anchor="ne" />
-								<normal color="#000000" font="Sans Condensed 10" />
-								<stock type="password-label" />
-							</item>
-						</box>
-					</item>
-					<item type="rect" >
-						<normal alpha="0.0" color="#cccccc" />
-						<pos width="box" y="50%" anchor="w" height="box" />
-						<box xpadding="0" spacing="10" ypadding="0" orientation="vertical" >
-							<item type="entry" id="user-entry" >
-								<pos width="130" x="50%" anchor="n" height="21" />
-							</item>
-							<item type="entry" id="pw-entry" >
-								<pos width="130" x="50%" anchor="n" height="21" />
-							</item>
-						</box>
-					</item>
-				</box>
-			</item>
-		</box>
-		<fixed>
-			<item type="label" id="pam-error" >
-				<pos x="435" y="293" anchor="s" />
-				<normal color="#CD0000" font="Sans 10" />
-				<text/>
-			</item>
-		</fixed>
-		<fixed>
-			<item type="label" id="caps-lock-warning" >
-				<normal color="#CD0000" font="Sans 10" />
-				<pos x="435" y="323" anchor="s" />
-				<stock type="caps-lock-warning" />
-			</item>
-		</fixed>
-	</item>
-</greeter>
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/gpl.txt.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/gpl.txt.svn-base
deleted file mode 100644
index b6f92f3db..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/gpl.txt.svn-base
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/preview.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/preview.png.svn-base
deleted file mode 100644
index f7712d7d2..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/preview.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_normal.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_normal.png.svn-base
deleted file mode 100644
index ea9b1bdfa..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_normal.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_over.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_over.png.svn-base
deleted file mode 100644
index 7d535efc8..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_over.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_pressed.png.svn-base b/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_pressed.png.svn-base
deleted file mode 100644
index ea9b1bdfa..000000000
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/artwork/tdm-theme/.svn/text-base/system_pressed.png.svn-base
+++ /dev/null
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/changelog b/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/changelog
index 7d0ddb88b..2fc3af7de 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/changelog
+++ b/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst b/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
index 3c6ed630e..6fddf6549 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/kubuntu-default-settings-trinity.postinst
@@ -14,7 +14,7 @@ case "$1" in
     fi
 
 	# Clean up this stubborn file
-	rm -rf /etc/default/kdm-trinity.d/20_kubuntu_default_settings
+	rm -rf /etc/default/tdm-trinity.d/20_kubuntu_default_settings
 
 	# create links for .hidden files, don't bail out if s.th. goes wrong.
 	if [ -d /media ]; then
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/kubuntu-default-settings/hal/20-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/kubuntu-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
index d12811dd2..b172909b8 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc b/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
index 280fdc386..14134537d 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-rc-files/twincrystalrc
+++ b/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
index a7d794744..5afe596ad 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
index d08a1fe0b..d08a1fe0b 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-profile/kde4rc
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-profile/kde-user-profile
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kderc b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tde-profile/tderc
index df5ec9dc6..7e4f0424b 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kderc
+++ b/ubuntu/raring/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/raring/defaultsettings/kubuntu-default-settings/tdmdistrc b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tdmdistrc
index df53c8a16..b7147bf9f 100644
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/tdmdistrc
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/tdmdistrc
@@ -1,12 +1,12 @@
-# KDM master configuration file
+# TDM master configuration file
 #
 # Please note: Settings in this file are sometimes ignored (overridden).
-# The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d
+# The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d
 # for theme-related settings which, if found, take precedence. The possibly 
 # overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
-# See /usr/share/doc/kdm/README.Debian for details
+# See /usr/share/doc/tdm/README.Debian for details
 #
-# Definition: the greeter is the login dialog, i.e., the part of KDM
+# Definition: the greeter is the login dialog, i.e., the part of TDM
 # which the user sees.
 #
 # You can configure every X-display individually.
@@ -42,7 +42,7 @@
 #
 # Every comment applies to the following section or key. Note that all
 # comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
+# The defaults refer to TDM's built-in values, not anything set in this file.
 #
 # Special characters need to be backslash-escaped (leading and trailing
 # spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
@@ -72,26 +72,26 @@ ServerVTs=-7
 # TTYs (without /dev/) to monitor for activity while in console mode.
 # Default is ""
 ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-# Where KDM should store its PID (do not store if empty).
+# Where TDM should store its PID (do not store if empty).
 # Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
+PidFile=/var/run/tdm.pid
+# Whether TDM should lock the PID file to prevent having multiple TDM
 # instances running at once. Do not change unless you are brave.
 # Default is true
 #LockPidFile=false
 # Where to store authorization files.
 # Default is "/var/run/xauth"
 #AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
+# Whether TDM should automatically re-read configuration files, if it
 # finds them having changed.
 # Default is true
 #AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
+# Additional environment variables TDM should pass on to all programs it runs.
 # LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
 # otherwise, it should not be necessary very often.
 # Default is ""
 #ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A character device KDM should read entropy from.
+# A character device TDM should read entropy from.
 # Empty means use the system's preferred entropy device.
 # Default is ""
 #RandomDevice=/dev/altrandom
@@ -103,25 +103,25 @@ PidFile=/var/run/kdm.pid
 # can be either a name or a numerical ID.
 # Default is 0
 #FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
+# The directory in which TDM should store persistent working data.
+# Default is "/var/lib/tdm"
 #DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
+# The directory in which TDM should store users' .dmrc files. This is only
 # needed if the home directories are not readable before actually logging in
 # (like with AFS).
 # Default is ""
 #DmrcDir=/nfs-shared/var/dmrcs
 
 [Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
+# Whether TDM should listen to incoming XDMCP requests.
 # Default is true
 Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
+# The UDP port on which TDM should listen for XDMCP requests. Do not change.
 # Default is 177
 #Port=177
 # File with the private keys of X-terminals. Required for XDM authentication.
 # Default is ""
-#KeyFile=/etc/trinity/tdm/kdmkeys
+#KeyFile=/etc/trinity/tdm/tdmkeys
 # XDMCP access control file in the usual XDM-Xaccess format.
 # Default is "/etc/trinity/tdm/Xaccess"
 #Xaccess=
@@ -157,7 +157,7 @@ Willing=/etc/trinity/tdm/Xwilling
 # system via the global command FiFo.
 # Default is true
 #AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
+# The boot manager TDM should use for offering boot options in the
 # shutdown dialog.
 # "None" - no boot manager
 # "Grub" - Grub boot manager
@@ -165,7 +165,7 @@ Willing=/etc/trinity/tdm/Xwilling
 # Default is None
 #BootManager=Grub
 
-# Rough estimations about how many seconds KDM will spend at most on
+# Rough estimations about how many seconds TDM will spend at most on
 # - opening a connection to the X-server (OpenTime) if the attempt
 #   - times out: OpenTimeout
 #   - is refused: OpenRepeat * OpenDelay
@@ -279,13 +279,13 @@ AllowShutdown=Root
 # Default is Never
 #ScheduledSd=Optional
 # The directories containing session type definitions in .desktop format.
-# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
-#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions
+# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions"
+#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions
 # The file (relative to $HOME) to redirect the session output to. This is
 # a printf format string; one %s will be replaced with the display name.
 # Default is ".xsession-errors"
 ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Whether TDM's built-in utmp/wtmp/lastlog registration should be used.
 # Default is false
 #UseSessReg=true
 
@@ -319,7 +319,7 @@ UseSAK=false
 LogoArea=Logo
 # The image to show when LogoArea=Logo.
 # Default is ""
-LogoPixmap=/opt/trinity/share/apps/kdm/pics/kdelogo.png
+LogoPixmap=/opt/trinity/share/apps/tdm/pics/kdelogo.png
 # The relative coordinates (X,Y in percent) of the center of the greeter.
 # Default is "50,50"
 #GreeterPos=30,40
@@ -397,7 +397,7 @@ MaxShowUID=29999
 # Default is AdminOnly
 #FaceSource=PreferUser
 # The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/opt/trinity/share/apps/kdm/faces"
+# Default is "/opt/trinity/share/apps/tdm/faces"
 #FaceDir=/usr/share/faces
 # Specify, if/which user should be preselected for log in.
 # "None" - do not preselect any user
@@ -415,7 +415,7 @@ MaxShowUID=29999
 # "NoEcho" - nothing is shown at all, the cursor does not move
 # Default is OneStar
 #EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM; otherwise, the
+# If true, krootimage will be automatically started by TDM; otherwise, the
 # Setup script should be used to setup the background.
 # Default is true
 #UseBackground=false
@@ -464,8 +464,8 @@ Preloader=/opt/trinity/bin/preloadkde
 UseTheme=true
 # The theme to use for the greeter. Can point to either a directory or an XML
 # file.
-# Default is "/opt/trinity/share/apps/kdm/themes/o2_enterprise"
-Theme=/opt/trinity/share/apps/kdm/themes/kubuntu-trinity
+# Default is "/opt/trinity/share/apps/tdm/themes/o2_enterprise"
+Theme=/opt/trinity/share/apps/tdm/themes/kubuntu-trinity
 
 # Core config for local displays
 [X-:*-Core]
@@ -563,7 +563,7 @@ AllowClose=true
 #AutoLoginUser=fred
 # The password for the user to log in automatically. This is NOT required
 # unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
+# option, you should "chmod 600 tdmrc" for obvious reasons.
 # Default is ""
 #AutoLoginPass=secret!
 # Immediately lock the automatically started session. This works only with
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile
index 52a9e7963..6c213aa2c 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/Makefile
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/backgroundrc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/backgroundrc
index e52cd6221..ae6e5fcf3 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/backgroundrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
index 0c9f3e433..652cc32e4 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/redmond-default-settings-trinity.postinst
@@ -14,7 +14,7 @@ case "$1" in
     fi
 
 	# Clean this file, as it seems to be removal resistant...
-	rm -rf /etc/default/kdm-trinity.d/20_kubuntu_default_settings
+	rm -rf /etc/default/tdm-trinity.d/20_kubuntu_default_settings
 
 	# create links for .hidden files, don't bail out if s.th. goes wrong.
 	if [ -d /media ]; then
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/hal/20-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/hal/hal-policy-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
index 54d5dc921..dd67afa35 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
index 3368a104a..e86bdc2e0 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-rc-files/twincrystalrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
index 897bed37a..a6f9f10fd 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
index 454fa83f3..454fa83f3 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-profile/kde4rc
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tde-profile/kde4rc
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-profile/kde-user-profile
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tde-profile/tde-user-profile
diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-profile/kderc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tde-profile/tderc
index c2f5a61e6..f6a7decc9 100755
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/kde-profile/kderc
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/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/
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tdmdistrc b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tdmdistrc
index 9535bca9c..006b74dcc 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tdmdistrc
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/tdmdistrc
@@ -1,12 +1,12 @@
-# KDM master configuration file
+# TDM master configuration file
 #
 # Please note: Settings in this file are sometimes ignored (overridden).
-# The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d
+# The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d
 # for theme-related settings which, if found, take precedence. The possibly 
 # overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
-# See /usr/share/doc/kdm/README.Debian for details
+# See /usr/share/doc/tdm/README.Debian for details
 #
-# Definition: the greeter is the login dialog, i.e., the part of KDM
+# Definition: the greeter is the login dialog, i.e., the part of TDM
 # which the user sees.
 #
 # You can configure every X-display individually.
@@ -42,7 +42,7 @@
 #
 # Every comment applies to the following section or key. Note that all
 # comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
+# The defaults refer to TDM's built-in values, not anything set in this file.
 #
 # Special characters need to be backslash-escaped (leading and trailing
 # spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
@@ -72,26 +72,26 @@ ServerVTs=-7
 # TTYs (without /dev/) to monitor for activity while in console mode.
 # Default is ""
 ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-# Where KDM should store its PID (do not store if empty).
+# Where TDM should store its PID (do not store if empty).
 # Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
+PidFile=/var/run/tdm.pid
+# Whether TDM should lock the PID file to prevent having multiple TDM
 # instances running at once. Do not change unless you are brave.
 # Default is true
 #LockPidFile=false
 # Where to store authorization files.
 # Default is "/var/run/xauth"
 #AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
+# Whether TDM should automatically re-read configuration files, if it
 # finds them having changed.
 # Default is true
 #AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
+# Additional environment variables TDM should pass on to all programs it runs.
 # LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
 # otherwise, it should not be necessary very often.
 # Default is ""
 #ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A character device KDM should read entropy from.
+# A character device TDM should read entropy from.
 # Empty means use the system's preferred entropy device.
 # Default is ""
 #RandomDevice=/dev/altrandom
@@ -103,25 +103,25 @@ PidFile=/var/run/kdm.pid
 # can be either a name or a numerical ID.
 # Default is 0
 #FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
+# The directory in which TDM should store persistent working data.
+# Default is "/var/lib/tdm"
 #DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
+# The directory in which TDM should store users' .dmrc files. This is only
 # needed if the home directories are not readable before actually logging in
 # (like with AFS).
 # Default is ""
 #DmrcDir=/nfs-shared/var/dmrcs
 
 [Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
+# Whether TDM should listen to incoming XDMCP requests.
 # Default is true
 Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
+# The UDP port on which TDM should listen for XDMCP requests. Do not change.
 # Default is 177
 #Port=177
 # File with the private keys of X-terminals. Required for XDM authentication.
 # Default is ""
-#KeyFile=/etc/trinity/tdm/kdmkeys
+#KeyFile=/etc/trinity/tdm/tdmkeys
 # XDMCP access control file in the usual XDM-Xaccess format.
 # Default is "/etc/trinity/tdm/Xaccess"
 #Xaccess=
@@ -157,7 +157,7 @@ Willing=/etc/trinity/tdm/Xwilling
 # system via the global command FiFo.
 # Default is true
 #AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
+# The boot manager TDM should use for offering boot options in the
 # shutdown dialog.
 # "None" - no boot manager
 # "Grub" - Grub boot manager
@@ -165,7 +165,7 @@ Willing=/etc/trinity/tdm/Xwilling
 # Default is None
 #BootManager=Grub
 
-# Rough estimations about how many seconds KDM will spend at most on
+# Rough estimations about how many seconds TDM will spend at most on
 # - opening a connection to the X-server (OpenTime) if the attempt
 #   - times out: OpenTimeout
 #   - is refused: OpenRepeat * OpenDelay
@@ -279,13 +279,13 @@ AllowShutdown=Root
 # Default is Never
 #ScheduledSd=Optional
 # The directories containing session type definitions in .desktop format.
-# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
-#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions
+# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions"
+#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions
 # The file (relative to $HOME) to redirect the session output to. This is
 # a printf format string; one %s will be replaced with the display name.
 # Default is ".xsession-errors"
 ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Whether TDM's built-in utmp/wtmp/lastlog registration should be used.
 # Default is false
 #UseSessReg=true
 
@@ -316,10 +316,10 @@ 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/kdm/pics/kdelogo.png
+LogoPixmap=/opt/trinity/share/apps/tdm/pics/kdelogo.png
 # The relative coordinates (X,Y in percent) of the center of the greeter.
 # Default is "50,50"
 #GreeterPos=30,40
@@ -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
@@ -397,7 +397,7 @@ MaxShowUID=29999
 # Default is AdminOnly
 #FaceSource=PreferUser
 # The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/opt/trinity/share/apps/kdm/faces"
+# Default is "/opt/trinity/share/apps/tdm/faces"
 #FaceDir=/usr/share/faces
 # Specify, if/which user should be preselected for log in.
 # "None" - do not preselect any user
@@ -415,7 +415,7 @@ MaxShowUID=29999
 # "NoEcho" - nothing is shown at all, the cursor does not move
 # Default is OneStar
 #EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM; otherwise, the
+# If true, krootimage will be automatically started by TDM; otherwise, the
 # Setup script should be used to setup the background.
 # Default is true
 #UseBackground=false
@@ -464,8 +464,8 @@ Preloader=/opt/trinity/bin/preloadkde
 UseTheme=false
 # The theme to use for the greeter. Can point to either a directory or an XML
 # file.
-# Default is "/opt/trinity/share/apps/kdm/themes/o2_enterprise"
-Theme=/opt/trinity/share/apps/kdm/themes/kubuntu-trinity
+# Default is "/opt/trinity/share/apps/tdm/themes/o2_enterprise"
+Theme=/opt/trinity/share/apps/tdm/themes/kubuntu-trinity
 
 # Core config for local displays
 [X-:*-Core]
@@ -563,7 +563,7 @@ AllowClose=true
 #AutoLoginUser=fred
 # The password for the user to log in automatically. This is NOT required
 # unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
+# option, you should "chmod 600 tdmrc" for obvious reasons.
 # Default is ""
 #AutoLoginPass=secret!
 # Immediately lock the automatically started session. This works only with
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile b/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile
index 77c7d269a..40306f9ae 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/Makefile
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
index eb31db57b..23a675af0 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/redmond-default-settings-trinity.postinst
@@ -14,7 +14,7 @@ case "$1" in
     fi
 
 	# Clean this file, as it seems to be removal resistant...
-	rm -rf /etc/default/kdm-trinity.d/20_kubuntu_default_settings
+	rm -rf /etc/default/tdm-trinity.d/20_kubuntu_default_settings
 
 	# create links for .hidden files, don't bail out if s.th. goes wrong.
 	if [ -d /media ]; then
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/redmond-default-settings/hal/20-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi b/ubuntu/raring/defaultsettings/redmond-default-settings/hal/hal-policy-ntfs-config-write-policy.fdi
deleted file mode 100644
index 2dead0109..000000000
--- a/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
index 54d5dc921..dd67afa35 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc b/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
index 3368a104a..e86bdc2e0 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-rc-files/twincrystalrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc b/ubuntu/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
index 897bed37a..a6f9f10fd 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kcmnspluginrc
+++ b/ubuntu/raring/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/raring/defaultsettings/redmond-default-settings/kde-profile/kde4rc b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/kde4rc
index 454fa83f3..454fa83f3 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde4rc
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/kde4rc
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
index 647a34e46..647a34e46 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/kde-profile/kde-user-profile
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tde-user-profile
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-profile/kderc b/ubuntu/raring/defaultsettings/redmond-default-settings/tde-profile/tderc
index df5ec9dc6..f6a7decc9 100755
--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/kde-profile/kderc
+++ b/ubuntu/raring/defaultsettings/redmond-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/redmond-default-settings-trinity/tde-profile/default/
diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc b/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc
index 72678a3e7..dc0a36c78 100644
--- a/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/tdmdistrc
@@ -1,12 +1,12 @@
-# KDM master configuration file
+# TDM master configuration file
 #
 # Please note: Settings in this file are sometimes ignored (overridden).
-# The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d
+# The default TDM startup script /etc/init.d/tdm looks in /etc/default/tdm.d
 # for theme-related settings which, if found, take precedence. The possibly 
 # overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
-# See /usr/share/doc/kdm/README.Debian for details
+# See /usr/share/doc/tdm/README.Debian for details
 #
-# Definition: the greeter is the login dialog, i.e., the part of KDM
+# Definition: the greeter is the login dialog, i.e., the part of TDM
 # which the user sees.
 #
 # You can configure every X-display individually.
@@ -42,7 +42,7 @@
 #
 # Every comment applies to the following section or key. Note that all
 # comments will be lost if you change this file with the kcontrol frontend.
-# The defaults refer to KDM's built-in values, not anything set in this file.
+# The defaults refer to TDM's built-in values, not anything set in this file.
 #
 # Special characters need to be backslash-escaped (leading and trailing
 # spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
@@ -72,26 +72,26 @@ ServerVTs=-7
 # TTYs (without /dev/) to monitor for activity while in console mode.
 # Default is ""
 ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
-# Where KDM should store its PID (do not store if empty).
+# Where TDM should store its PID (do not store if empty).
 # Default is ""
-PidFile=/var/run/kdm.pid
-# Whether KDM should lock the PID file to prevent having multiple KDM
+PidFile=/var/run/tdm.pid
+# Whether TDM should lock the PID file to prevent having multiple TDM
 # instances running at once. Do not change unless you are brave.
 # Default is true
 #LockPidFile=false
 # Where to store authorization files.
 # Default is "/var/run/xauth"
 #AuthDir=/tmp
-# Whether KDM should automatically re-read configuration files, if it
+# Whether TDM should automatically re-read configuration files, if it
 # finds them having changed.
 # Default is true
 #AutoRescan=false
-# Additional environment variables KDM should pass on to all programs it runs.
+# Additional environment variables TDM should pass on to all programs it runs.
 # LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
 # otherwise, it should not be necessary very often.
 # Default is ""
 #ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
-# A character device KDM should read entropy from.
+# A character device TDM should read entropy from.
 # Empty means use the system's preferred entropy device.
 # Default is ""
 #RandomDevice=/dev/altrandom
@@ -103,25 +103,25 @@ PidFile=/var/run/kdm.pid
 # can be either a name or a numerical ID.
 # Default is 0
 #FifoGroup=xdmctl
-# The directory in which KDM should store persistent working data.
-# Default is "/var/lib/kdm"
+# The directory in which TDM should store persistent working data.
+# Default is "/var/lib/tdm"
 #DataDir=
-# The directory in which KDM should store users' .dmrc files. This is only
+# The directory in which TDM should store users' .dmrc files. This is only
 # needed if the home directories are not readable before actually logging in
 # (like with AFS).
 # Default is ""
 #DmrcDir=/nfs-shared/var/dmrcs
 
 [Xdmcp]
-# Whether KDM should listen to incoming XDMCP requests.
+# Whether TDM should listen to incoming XDMCP requests.
 # Default is true
 Enable=false
-# The UDP port on which KDM should listen for XDMCP requests. Do not change.
+# The UDP port on which TDM should listen for XDMCP requests. Do not change.
 # Default is 177
 #Port=177
 # File with the private keys of X-terminals. Required for XDM authentication.
 # Default is ""
-#KeyFile=/etc/trinity/tdm/kdmkeys
+#KeyFile=/etc/trinity/tdm/tdmkeys
 # XDMCP access control file in the usual XDM-Xaccess format.
 # Default is "/etc/trinity/tdm/Xaccess"
 #Xaccess=
@@ -157,7 +157,7 @@ Willing=/etc/trinity/tdm/Xwilling
 # system via the global command FiFo.
 # Default is true
 #AllowFifoNow=false
-# The boot manager KDM should use for offering boot options in the
+# The boot manager TDM should use for offering boot options in the
 # shutdown dialog.
 # "None" - no boot manager
 # "Grub" - Grub boot manager
@@ -165,7 +165,7 @@ Willing=/etc/trinity/tdm/Xwilling
 # Default is None
 #BootManager=Grub
 
-# Rough estimations about how many seconds KDM will spend at most on
+# Rough estimations about how many seconds TDM will spend at most on
 # - opening a connection to the X-server (OpenTime) if the attempt
 #   - times out: OpenTimeout
 #   - is refused: OpenRepeat * OpenDelay
@@ -279,13 +279,13 @@ AllowShutdown=Root
 # Default is Never
 #ScheduledSd=Optional
 # The directories containing session type definitions in .desktop format.
-# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
-#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions
+# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions"
+#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/tdm/sessions
 # The file (relative to $HOME) to redirect the session output to. This is
 # a printf format string; one %s will be replaced with the display name.
 # Default is ".xsession-errors"
 ClientLogFile=.xsession-errors-%s
-# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Whether TDM's built-in utmp/wtmp/lastlog registration should be used.
 # Default is false
 #UseSessReg=true
 
@@ -319,7 +319,7 @@ ClientLogFile=.xsession-errors-%s
 LogoArea=Logo
 # The image to show when LogoArea=Logo.
 # Default is ""
-LogoPixmap=/opt/trinity/share/apps/kdm/pics/kdelogo.png
+LogoPixmap=/opt/trinity/share/apps/tdm/pics/kdelogo.png
 # The relative coordinates (X,Y in percent) of the center of the greeter.
 # Default is "50,50"
 #GreeterPos=30,40
@@ -397,7 +397,7 @@ MaxShowUID=29999
 # Default is AdminOnly
 #FaceSource=PreferUser
 # The directory containing the user images if FaceSource is not UserOnly.
-# Default is "/opt/trinity/share/apps/kdm/faces"
+# Default is "/opt/trinity/share/apps/tdm/faces"
 #FaceDir=/usr/share/faces
 # Specify, if/which user should be preselected for log in.
 # "None" - do not preselect any user
@@ -415,7 +415,7 @@ MaxShowUID=29999
 # "NoEcho" - nothing is shown at all, the cursor does not move
 # Default is OneStar
 #EchoMode=NoEcho
-# If true, krootimage will be automatically started by KDM; otherwise, the
+# If true, krootimage will be automatically started by TDM; otherwise, the
 # Setup script should be used to setup the background.
 # Default is true
 #UseBackground=false
@@ -464,8 +464,8 @@ Preloader=/opt/trinity/bin/preloadkde
 #UseTheme=true
 # The theme to use for the greeter. Can point to either a directory or an XML
 # file.
-# Default is "/opt/trinity/share/apps/kdm/themes/o2_enterprise"
-Theme=/opt/trinity/share/apps/kdm/themes/kubuntu-trinity
+# Default is "/opt/trinity/share/apps/tdm/themes/o2_enterprise"
+Theme=/opt/trinity/share/apps/tdm/themes/kubuntu-trinity
 
 # Core config for local displays
 [X-:*-Core]
@@ -563,7 +563,7 @@ AllowClose=true
 #AutoLoginUser=fred
 # The password for the user to log in automatically. This is NOT required
 # unless the user is logged into a NIS or Kerberos domain. If you use this
-# option, you should "chmod 600 kdmrc" for obvious reasons.
+# option, you should "chmod 600 tdmrc" for obvious reasons.
 # Default is ""
 #AutoLoginPass=secret!
 # Immediately lock the automatically started session. This works only with