Fix debian menu files on Debian and Ubuntu

351 files changed, 723 insertions, 723 deletions

diff --git a/debian/lenny/applications/abakus/debian/abakus-trinity.menu b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/debian/lenny/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/lenny/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
  title="AbaKus"\
  command="/opt/trinity/bin/abakus"\
  hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/lenny/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Sound"\
 	hints="TDE"\
 	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
 	command="/opt/trinity/bin/amarok"
diff --git a/debian/lenny/applications/amarok/debian/amarok-trinity.menu b/debian/lenny/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/lenny/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/lenny/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Sound"\
 	hints="TDE"\
 	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
 	command="/opt/trinity/bin/amarok"
diff --git a/debian/lenny/applications/bibletime/debian/menu b/debian/lenny/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/debian/lenny/applications/bibletime/debian/menu
+++ b/debian/lenny/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
 ?package(bibletime):\
     needs="X11"\
-    hints="KDE,Bible"\
+    hints="TDE,Bible"\
     section="Applications/Education"\
     title="BibleTime"\
     icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/debian/lenny/applications/digikam/debian/digikam-trinity.menu b/debian/lenny/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/debian/lenny/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/lenny/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="digikam"\
-	icon32x32="/usr/share/pixmaps/digikam.xpm"\
-	icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
 	command="/opt/trinity/bin/digikam"
diff --git a/debian/lenny/applications/digikam/debian/showfoto-trinity.menu b/debian/lenny/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/debian/lenny/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/lenny/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="showfoto"\
-	icon32x32="/usr/share/pixmaps/showfoto.xpm"\
-	icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
 	command="/opt/trinity/bin/showfoto"
diff --git a/debian/lenny/applications/filelight/debian/menu b/debian/lenny/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/debian/lenny/applications/filelight/debian/menu
+++ b/debian/lenny/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
 ?package(filelight):needs="X11" \
         section="Apps/System" \
-        hints="KDE, Monitoring, Files" \
+        hints="TDE, Monitoring, Files" \
         command="/opt/trinity/bin/filelight" \
         title="Filelight" \
         longtitle="Filelight: disk usage as concentric rings"
diff --git a/debian/lenny/applications/gwenview/debian/menu b/debian/lenny/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/debian/lenny/applications/gwenview/debian/menu
+++ b/debian/lenny/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
 ?package(gwenview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,Images"\
 	title="Gwenview"\
 	command="/opt/trinity/bin/gwenview"\
-	icon="/usr/share/pixmaps/gwenview.xpm"
+	icon="/opt/trinity/share/pixmaps/gwenview.xpm"
diff --git a/debian/lenny/applications/k3b/debian/k3b-trinity.menu b/debian/lenny/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/debian/lenny/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/lenny/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/File Management"\
 	title="K3b"\
 	command="/opt/trinity/bin/k3b"\
-	icon="/usr/share/pixmaps/k3b.xpm"
+	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/lenny/applications/k3b/debian/k3b.menu b/debian/lenny/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/debian/lenny/applications/k3b/debian/k3b.menu
+++ b/debian/lenny/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
 	needs="X11"\
 	section="Applications/File Management"\
 	title="K3b"\
-	command="/usr/bin/k3b"\
-	icon="/usr/share/pixmaps/k3b.xpm"
+	command="/opt/trinity/bin/k3b"\
+	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/lenny/applications/kaffeine/debian/menu b/debian/lenny/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/debian/lenny/applications/kaffeine/debian/menu
+++ b/debian/lenny/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
 	hints="TDE"\
 	title="Kaffeine"\
 	command="/opt/trinity/bin/kaffeine"\
-	icon="/usr/share/pixmaps/kaffeine.xpm"
+	icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
diff --git a/debian/lenny/applications/kbarcode/debian/menu b/debian/lenny/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/debian/lenny/applications/kbarcode/debian/menu
+++ b/debian/lenny/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
 ?package(kbarcode):\
   needs="X11"\
   section="Applications/Graphics"\
-  hints="KDE,Barcode"\
+  hints="TDE,Barcode"\
   title="KBarcode"\
-  command="/usr/bin/kbarcode"
+  command="/opt/trinity/bin/kbarcode"
diff --git a/debian/lenny/applications/kcpuload/debian/menu b/debian/lenny/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/debian/lenny/applications/kcpuload/debian/menu
+++ b/debian/lenny/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
   kderemove="1"\
   title="KCPULoad"\
   command="/opt/trinity/bin/kcpuload"\
-  icon="/usr/share/pixmaps/kcpuload.xpm"
+  icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/debian/lenny/applications/kile/debian/menu b/debian/lenny/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/debian/lenny/applications/kile/debian/menu
+++ b/debian/lenny/applications/kile/debian/menu
@@ -4,4 +4,4 @@
   title="Kile" \
   longtitle="Kile (LaTeX development environment)" \
   command="/opt/trinity/bin/kile" \
-  icon="/usr/share/pixmaps/kile.xpm"
+  icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/debian/lenny/applications/knetload/debian/menu b/debian/lenny/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/debian/lenny/applications/knetload/debian/menu
+++ b/debian/lenny/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
   hints="TDE"\
   title="KNetLoad"\
   command="/opt/trinity/bin/knetload"\
-  icon="/usr/share/pixmaps/knetload.xpm"
+  icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/debian/lenny/applications/knetworkmanager.cmake/debian/menu b/debian/lenny/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/lenny/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/lenny/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
 	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/knetworkmanager8/debian/menu b/debian/lenny/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/lenny/applications/knetworkmanager8/debian/menu
+++ b/debian/lenny/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
 	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/lenny/applications/koffice/debian/chalk-trinity.menu b/debian/lenny/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/debian/lenny/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
 ?package(chalk):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Bitmap"\
+	hints="TDE,Bitmap"\
 	title="Chalk"\
 	longtitle="Chalk (Image Manipulation)"\
 	icon="/opt/trinity/share/pixmaps/chalk.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/karbon-trinity.menu b/debian/lenny/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/debian/lenny/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
 ?package(karbon):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Vector"\
+	hints="TDE,Vector"\
 	title="Karbon"\
 	longtitle="Karbon (Scalable Graphics)"\
 	icon="/opt/trinity/share/pixmaps/karbon.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kchart-trinity.menu b/debian/lenny/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/debian/lenny/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kchart):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Graphs"\
+	hints="TDE,Graphs"\
 	title="KChart"\
 	longtitle="KChart (Charting)"\
 	icon="/opt/trinity/share/pixmaps/kchart.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kivio-trinity.menu b/debian/lenny/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/debian/lenny/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kivio):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Vector"\
+	hints="TDE,Vector"\
 	title="Kivio"\
 	longtitle="Kivio (Flowchart and Diagram Editing)"\
 	icon="/opt/trinity/share/pixmaps/kivio.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu b/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kpresenter):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Presentation"\
+	hints="TDE,Presentation"\
 	title="KPresenter"\
 	longtitle="KPresenter (Slide Presentations)"\
 	icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kspread-trinity.menu b/debian/lenny/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/debian/lenny/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kspread):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Spreadsheets"\
+	hints="TDE,Spreadsheets"\
 	title="KSpread"\
 	longtitle="KSpread (Spreadsheets)"\
 	icon="/opt/trinity/share/pixmaps/kspread.xpm"\
diff --git a/debian/lenny/applications/koffice/debian/kword-trinity.menu b/debian/lenny/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/debian/lenny/applications/koffice/debian/kword-trinity.menu
+++ b/debian/lenny/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kword):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Word processors"\
+	hints="TDE,Word processors"\
 	title="KWord"\
 	longtitle="KWord (Word Processing)"\
 	icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/debian/lenny/applications/kpicosim/debian/menu b/debian/lenny/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/debian/lenny/applications/kpicosim/debian/menu
+++ b/debian/lenny/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
 ?package(kpicosim):needs="X11" section="Apps/Science"\
-  title="kpicosim" command="/usr/bin/kpicosim"
+  title="kpicosim" command="/opt/trinity/bin/kpicosim"
diff --git a/debian/lenny/applications/kpowersave.cmake/debian/menu b/debian/lenny/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/debian/lenny/applications/kpowersave.cmake/debian/menu
+++ b/debian/lenny/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
   section="Applications/System/Monitoring"\
   title="KPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
+  icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
   command="/opt/trinity/bin/kpowersave"
diff --git a/debian/lenny/applications/krusader/debian/menu b/debian/lenny/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/debian/lenny/applications/krusader/debian/menu
+++ b/debian/lenny/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
 	section="Applications/Network/File Transfer"\
 	hints="TDE"\
 	title="krusader (File Manager)"\
-	icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
-	icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
 	command="/opt/trinity/bin/krusader"
 
 ?package(krusader):\
@@ -12,6 +12,6 @@
 	section="Applications/Network/File Transfer"\
 	hints="TDE"\
 	title="krusader - root-mode (File Manager)"\
-	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
-	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
 	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/debian/lenny/applications/ktechlab/debian/menu b/debian/lenny/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/debian/lenny/applications/ktechlab/debian/menu
+++ b/debian/lenny/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
   hints="TDE" \
   title="KTechLab" \
   command="/opt/trinity/bin/ktechlab" \
-  icon="/usr/share/pixmaps/ktechlab.xpm"
+  icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
diff --git a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/lenny/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Graphics"\
 	hints="TDE"\
 	title="Kuickshow"\
-	icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
-	icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
 	command="/opt/trinity/bin/kuickshow"
 
 # Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu b/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/lenny/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
 ?package(potracegui):needs="X11" section="Apps/Graphics"\
   title="potracegui" command="/opt/trinity/bin/potracegui"\
-  hints="KDE frontend for tracing programs"
+  hints="TDE frontend for tracing programs"
 
diff --git a/debian/lenny/applications/smb4k/debian/menu b/debian/lenny/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/debian/lenny/applications/smb4k/debian/menu
+++ b/debian/lenny/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
         section="Applications/Network"\
 	hints="TDE"\
 	kderemove="1"\
-        title="SAMBA for KDE"\
+        title="SAMBA for TDE"\
 	longtitle="SAMBA Advanced Browser"\
         command="/opt/trinity/bin/smb4k"
diff --git a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/debian/lenny/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
 ?package(tdesvn):\
   needs="X11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
-  title="KDESvn"\
+  hints="TDE,Version control"\
+  title="TDESvn"\
   longtitle="SVN client"\
-  icon="/usr/share/pixmaps/tdesvn.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
   command="/opt/trinity/bin/tdesvn"
diff --git a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/lenny/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
         needs="X11"\
         section="Applications/Network/Monitoring"\
         hints="TDE"\
-        icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
-        icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+        icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+        icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
         command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
 
diff --git a/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu b/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/lenny/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Terminal Emulators"\
 	title="YaKuake"\
-	icon32x32="/usr/share/pixmaps/yakuake.xpm"\
-	icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
 	command="/opt/trinity/bin/yakuake"
 
diff --git a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/lenny/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
 ?package(atlantikdesigner):needs="X11"\
   section="Games/Tool"\
-  hints="KDE,Monopoly"\
+  hints="TDE,Monopoly"\
   title="Atlantik Designer"\
   longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
   command="/opt/trinity/bin/atlantikdesigner"\
diff --git a/debian/lenny/tdeadmin/debian/kcron-trinity.menu b/debian/lenny/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/debian/lenny/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
-	title="KDE Task Scheduler"\
-	icon32x32="/usr/share/pixmaps/kcron.xpm"\
-	icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+	title="TDE Task Scheduler"\
+	icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
 	command="/opt/trinity/bin/kcron"
diff --git a/debian/lenny/tdeadmin/debian/kdat-trinity.menu b/debian/lenny/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/debian/lenny/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/System/Hardware"\
 	hints="TDE"\
 	title="KDat"\
-	icon32x32="/usr/share/pixmaps/kdat.xpm"\
-	icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
 	command="/opt/trinity/bin/kdat"
diff --git a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Package Management"\
 	hints="TDE"\
-	title="KDE Package Manager"\
-	icon32x32="/usr/share/pixmaps/kpackage.xpm"\
-	icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+	title="TDE Package Manager"\
+	icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
 	command="/opt/trinity/bin/kpackage"
diff --git a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
-	title="KDE SysV-Init Editor"\
-	icon32x32="/usr/share/pixmaps/ksysv.xpm"\
-	icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+	title="TDE SysV-Init Editor"\
+	icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
 	command="/opt/trinity/bin/ksysv"
diff --git a/debian/lenny/tdeadmin/debian/kuser-trinity.menu b/debian/lenny/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/debian/lenny/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/lenny/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
-	title="KDE User Manager"\
-	icon32x32="/usr/share/pixmaps/kuser.xpm"\
-	icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+	title="TDE User Manager"\
+	icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
 	command="/opt/trinity/bin/kuser"
diff --git a/debian/lenny/tdebase/debian/kate-trinity.menu b/debian/lenny/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/debian/lenny/tdebase/debian/kate-trinity.menu
+++ b/debian/lenny/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kate):\
 	needs="X11"\
 	section="Applications/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="Kate"\
 	icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
 ?package(kate):\
 	needs="X11"\
 	section="Applications/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KWrite"\
 	icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/lenny/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Help"\
 	hints="TDE"\
-	title="KDE Help Center"\
+	title="TDE Help Center"\
 	icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
 	command="/opt/trinity/bin/khelpcenter"
diff --git a/debian/lenny/tdebase/debian/konqueror-trinity.menu b/debian/lenny/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/debian/lenny/tdebase/debian/konqueror-trinity.menu
+++ b/debian/lenny/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
 ?package(konqueror):\
 	needs="X11"\
 	section="Applications/Network/Web Browsing"\
-	hints="KDE,Web browsers"\
+	hints="TDE,Web browsers"\
 	title="Konqueror"\
 	icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
 ?package(konqueror):\
 	needs="X11"\
 	section="Applications/File Management"\
-	hints="KDE,File managers"\
+	hints="TDE,File managers"\
 	title="Konqueror"\
 	icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
diff --git a/debian/lenny/tdebase/debian/ksysguard-trinity.menu b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/debian/lenny/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/lenny/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
-	title="KDE System Guard"\
+	title="TDE System Guard"\
 	icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
 	command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
-	title="KDE System Guard - Process Table"\
+	title="TDE System Guard - Process Table"\
 	command="/opt/trinity/bin/kpm"
 
 # Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
diff --git a/debian/lenny/tdebase/debian/tdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/debian/lenny/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
-	title="KDEPrintFax"\
+	title="TDEPrintFax"\
 	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
 	command="/opt/trinity/bin/tdeprintfax"
diff --git a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/lenny/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
 	needs="X11"\
 	section="Applications/Programming"\
 	hints="TDE"\
-	title="KDE JavaScript Console"\
+	title="TDE JavaScript Console"\
 	command="/opt/trinity/bin/kjscmd --console --exec"
diff --git a/debian/lenny/tdegames/debian/atlantik-trinity.menu b/debian/lenny/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/debian/lenny/tdegames/debian/atlantik-trinity.menu
+++ b/debian/lenny/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
 ?package(atlantik):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Monopoly"\
+	hints="TDE,Monopoly"\
 	title="Atlantik"\
-	icon32x32="/usr/share/pixmaps/atlantik.xpm"\
-	icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
 	command="/opt/trinity/games/atlantik"
 
diff --git a/debian/lenny/tdegames/debian/kasteroids-trinity.menu b/debian/lenny/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/debian/lenny/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/lenny/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KAsteroids"\
-	icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
-	icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
 	command="/opt/trinity/games/kasteroids"
 
diff --git a/debian/lenny/tdegames/debian/katomic-trinity.menu b/debian/lenny/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/debian/lenny/tdegames/debian/katomic-trinity.menu
+++ b/debian/lenny/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Puzzles"\
 	hints="TDE"\
-	title="KDE Atomic Entertainment"\
-	icon32x32="/usr/share/pixmaps/katomic.xpm"\
-	icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+	title="TDE Atomic Entertainment"\
+	icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
 	command="/opt/trinity/games/katomic"
 
diff --git a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Backgammon"\
-	icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
-	icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+	title="TDE Backgammon"\
+	icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
 	command="/opt/trinity/games/kbackgammon"
 
diff --git a/debian/lenny/tdegames/debian/kbattleship-trinity.menu b/debian/lenny/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/debian/lenny/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
         section="Games/Board"\
         hints="TDE"\
         title="KBattleship"\
-	icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
-	icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
         command="/opt/trinity/games/kbattleship"
diff --git a/debian/lenny/tdegames/debian/kblackbox-trinity.menu b/debian/lenny/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/debian/lenny/tdegames/debian/kblackbox-trinity.menu
+++ b/debian/lenny/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kblackbox):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,BlackBox"\
+	hints="TDE,BlackBox"\
 	title="KBlackBox"\
-	icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
-	icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
 	command="/opt/trinity/games/kblackbox"
 
diff --git a/debian/lenny/tdegames/debian/kbounce-trinity.menu b/debian/lenny/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/debian/lenny/tdegames/debian/kbounce-trinity.menu
+++ b/debian/lenny/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Bounce Ball Game"\
-	icon32x32="/usr/share/pixmaps/kbounce.xpm"\
-	icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+	title="TDE Bounce Ball Game"\
+	icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
 	command="/opt/trinity/games/kbounce"
 
diff --git a/debian/lenny/tdegames/debian/kenolaba-trinity.menu b/debian/lenny/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/debian/lenny/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/lenny/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KEnolaba"\
-	icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
-	icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
 	command="/opt/trinity/games/kenolaba"
diff --git a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/lenny/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
         needs="x11"\
         section="Games/Tetris-like"\
 	hints="TDE"\
-        title="KDE Foul Eggs"\
-	icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
-	icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+        title="TDE Foul Eggs"\
+	icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
         command="/opt/trinity/games/kfouleggs"
 
diff --git a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/lenny/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KGoldrunner"\
-	icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
-	icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
 	command="/opt/trinity/games/kgoldrunner"
 
diff --git a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/lenny/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="KJumpingCube"\
-	icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
-	icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
 	command="/opt/trinity/games/kjumpingcube"
 
diff --git a/debian/lenny/tdegames/debian/klickety-trinity.menu b/debian/lenny/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/debian/lenny/tdegames/debian/klickety-trinity.menu
+++ b/debian/lenny/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Puzzles"\
 	hints="TDE"\
 	title="Klickety"\
-	icon32x32="/usr/share/pixmaps/klickety.xpm"\
-	icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
 	command="/opt/trinity/games/klickety"
 
diff --git a/debian/lenny/tdegames/debian/klines-trinity.menu b/debian/lenny/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/debian/lenny/tdegames/debian/klines-trinity.menu
+++ b/debian/lenny/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KLines"\
-	icon32x32="/usr/share/pixmaps/klines.xpm"\
-	icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
 	command="/opt/trinity/games/klines"
diff --git a/debian/lenny/tdegames/debian/kmahjongg-trinity.menu b/debian/lenny/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/debian/lenny/tdegames/debian/kmahjongg-trinity.menu
+++ b/debian/lenny/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmahjongg):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Mahjongg"\
+	hints="TDE,Mahjongg"\
 	title="KMahjongg"\
-	icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
-	icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
 	command="/opt/trinity/games/kmahjongg"
 
diff --git a/debian/lenny/tdegames/debian/kmines-trinity.menu b/debian/lenny/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/debian/lenny/tdegames/debian/kmines-trinity.menu
+++ b/debian/lenny/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmines):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="Kmines"\
-	icon32x32="/usr/share/pixmaps/kmines.xpm"\
-	icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
 	command="/opt/trinity/games/kmines"
 
diff --git a/debian/lenny/tdegames/debian/knetwalk-trinity.menu b/debian/lenny/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/debian/lenny/tdegames/debian/knetwalk-trinity.menu
+++ b/debian/lenny/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
 ?package(knetwalk):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="KNetwalk"\
-	icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
-	icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
 	command="/opt/trinity/games/knetwalk"
 
diff --git a/debian/lenny/tdegames/debian/kolf-trinity.menu b/debian/lenny/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/debian/lenny/tdegames/debian/kolf-trinity.menu
+++ b/debian/lenny/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Miniature Golf"\
-	icon32x32="/usr/share/pixmaps/kolf.xpm"\
-	icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+	title="TDE Miniature Golf"\
+	icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
 	command="/opt/trinity/games/kolf"
 
diff --git a/debian/lenny/tdegames/debian/konquest-trinity.menu b/debian/lenny/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/debian/lenny/tdegames/debian/konquest-trinity.menu
+++ b/debian/lenny/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="Konquest"\
-	icon32x32="/usr/share/pixmaps/konquest.xpm"\
-	icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
 	command="/opt/trinity/games/konquest"
 
diff --git a/debian/lenny/tdegames/debian/kpat-trinity.menu b/debian/lenny/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/debian/lenny/tdegames/debian/kpat-trinity.menu
+++ b/debian/lenny/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Patience"\
-	icon32x32="/usr/share/pixmaps/kpat.xpm"\
-	icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+	title="TDE Patience"\
+	icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
 	command="/opt/trinity/games/kpat"
 
diff --git a/debian/lenny/tdegames/debian/kpoker-trinity.menu b/debian/lenny/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/debian/lenny/tdegames/debian/kpoker-trinity.menu
+++ b/debian/lenny/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Poker"\
-	icon32x32="/usr/share/pixmaps/kpoker.xpm"\
-	icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+	title="TDE Poker"\
+	icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
 	command="/opt/trinity/games/kpoker"
 
diff --git a/debian/lenny/tdegames/debian/kreversi-trinity.menu b/debian/lenny/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/debian/lenny/tdegames/debian/kreversi-trinity.menu
+++ b/debian/lenny/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Reversi"\
-	icon32x32="/usr/share/pixmaps/kreversi.xpm"\
-	icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+	title="TDE Reversi"\
+	icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
 	command="/opt/trinity/games/kreversi"
 
diff --git a/debian/lenny/tdegames/debian/ksame-trinity.menu b/debian/lenny/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/debian/lenny/tdegames/debian/ksame-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksame):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,SameGame"\
-	title="KDE SameGame"\
-	icon32x32="/usr/share/pixmaps/ksame.xpm"\
-	icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+	hints="TDE,SameGame"\
+	title="TDE SameGame"\
+	icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
 	command="/opt/trinity/games/ksame"
 
diff --git a/debian/lenny/tdegames/debian/kshisen-trinity.menu b/debian/lenny/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/debian/lenny/tdegames/debian/kshisen-trinity.menu
+++ b/debian/lenny/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Shisen-Sho"\
-	icon32x32="/usr/share/pixmaps/kshisen.xpm"\
-	icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+	title="TDE Shisen-Sho"\
+	icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
 	command="/opt/trinity/games/kshisen"
 
diff --git a/debian/lenny/tdegames/debian/ksirtet-trinity.menu b/debian/lenny/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/debian/lenny/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Sirtet"\
-	icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
-	icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+	title="TDE Sirtet"\
+	icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
 	command="/opt/trinity/games/ksirtet"
 
diff --git a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Smiletris"\
-	icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
-	icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+	title="TDE Smiletris"\
+	icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
 	command="/opt/trinity/games/ksmiletris"
 
diff --git a/debian/lenny/tdegames/debian/ksnake-trinity.menu b/debian/lenny/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/debian/lenny/tdegames/debian/ksnake-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Snake Race"\
-	icon32x32="/usr/share/pixmaps/ksnake.xpm"\
-	icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+	title="TDE Snake Race"\
+	icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
 	command="/opt/trinity/games/ksnake"
 
diff --git a/debian/lenny/tdegames/debian/ksokoban-trinity.menu b/debian/lenny/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/debian/lenny/tdegames/debian/ksokoban-trinity.menu
+++ b/debian/lenny/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksokoban):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Sokoban"\
-	title="KDE Sokoban"\
-	icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
-	icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+	hints="TDE,Sokoban"\
+	title="TDE Sokoban"\
+	icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
 	command="/opt/trinity/games/ksokoban"
 
diff --git a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/lenny/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE SpaceDuel"\
-	icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
-	icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+	title="TDE SpaceDuel"\
+	icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
 	command="/opt/trinity/games/kspaceduel"
 
diff --git a/debian/lenny/tdegames/debian/ktron-trinity.menu b/debian/lenny/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/debian/lenny/tdegames/debian/ktron-trinity.menu
+++ b/debian/lenny/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Tron"\
-	icon32x32="/usr/share/pixmaps/ktron.xpm"\
-	icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+	title="TDE Tron"\
+	icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
 	command="/opt/trinity/games/ktron"
 
diff --git a/debian/lenny/tdegames/debian/ktuberling-trinity.menu b/debian/lenny/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/debian/lenny/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/lenny/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
-	title="KDE Potato Guy"\
-	icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
-	icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+	title="TDE Potato Guy"\
+	icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
 	command="/opt/trinity/games/ktuberling"
 
diff --git a/debian/lenny/tdegames/debian/kwin4-trinity.menu b/debian/lenny/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/debian/lenny/tdegames/debian/kwin4-trinity.menu
+++ b/debian/lenny/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KWin4"\
-	icon32x32="/usr/share/pixmaps/twin4.xpm"\
-	icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
 	command="/opt/trinity/games/twin4"
 
diff --git a/debian/lenny/tdegames/debian/lskat-trinity.menu b/debian/lenny/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/debian/lenny/tdegames/debian/lskat-trinity.menu
+++ b/debian/lenny/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Lieutnant Skat"\
-	icon32x32="/usr/share/pixmaps/lskat.xpm"\
-	icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+	title="TDE Lieutnant Skat"\
+	icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
 	command="/opt/trinity/games/lskat"
 
diff --git a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kdvi):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,DVI,Documents"\
+	hints="TDE,DVI,Documents"\
 	title="KDVI"\
 	icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kghostview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Documents"\
+	hints="TDE,Documents"\
 	title="KGhostView"\
 	icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kpovmodeler):\
 	needs="X11"\
 	section="Applications/Graphics"\
-	hints="KDE,Modeler"\
+	hints="TDE,Modeler"\
 	title="KPovModeler"\
 	icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
diff --git a/debian/lenny/tdegraphics/debian/kview-trinity.menu b/debian/lenny/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/debian/lenny/tdegraphics/debian/kview-trinity.menu
+++ b/debian/lenny/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,Images"\
 	title="KView"\
 	icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/kopete-trinity.menu b/debian/lenny/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/debian/lenny/tdenetwork/debian/kopete-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kopete):\
 	needs="X11"\
 	section="Apps/Net"\
-	hints="KDE,IM"\
+	hints="TDE,IM"\
 	title="Kopete"\
 	icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
diff --git a/debian/lenny/tdenetwork/debian/ksirc-trinity.menu b/debian/lenny/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/debian/lenny/tdenetwork/debian/ksirc-trinity.menu
+++ b/debian/lenny/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
 ?package(ksirc):\
 	needs="X11"\
 	section="Apps/Net"\
-	hints="KDE,IRC"\
+	hints="TDE,IRC"\
 	title="KSirc"\
 	icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
diff --git a/debian/lenny/tdepim/debian/akregator-trinity.menu b/debian/lenny/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/lenny/tdepim/debian/akregator-trinity.menu
+++ b/debian/lenny/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="aKregator"\
-	icon32x32="/usr/share/pixmaps/akregator.xpm"\
-	icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
 	command="/opt/trinity/bin/akregator"
diff --git a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/lenny/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAddressbook"\
-	icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
-	icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
 	command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/lenny/tdepim/debian/kalarm-trinity.menu b/debian/lenny/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/lenny/tdepim/debian/kalarm-trinity.menu
+++ b/debian/lenny/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAlarm"\
-	icon32x32="/usr/share/pixmaps/kalarm.xpm"\
-	icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
 	command="/opt/trinity/bin/kalarm"
diff --git a/debian/lenny/tdepim/debian/karm-trinity.menu b/debian/lenny/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/lenny/tdepim/debian/karm-trinity.menu
+++ b/debian/lenny/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Project Management"\
 	hints="TDE"\
 	title="KArm"\
-	icon32x32="/usr/share/pixmaps/karm.xpm"\
-	icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
 	command="/opt/trinity/bin/karm"
diff --git a/debian/lenny/tdepim/debian/kmail-trinity.menu b/debian/lenny/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/lenny/tdepim/debian/kmail-trinity.menu
+++ b/debian/lenny/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
 ?package(kmail):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail"\
-	icon32x32="/usr/share/pixmaps/kmail.xpm"\
-	icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
 	command="/opt/trinity/bin/kmail"
diff --git a/debian/lenny/tdepim/debian/kmailcvt-trinity.menu b/debian/lenny/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/lenny/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/lenny/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
 ?package(kmailcvt):\
 	needs="X11"\
 	section="Applications/Data Management"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail/KAB Import Tool"\
 	command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/lenny/tdepim/debian/knode-trinity.menu b/debian/lenny/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/lenny/tdepim/debian/knode-trinity.menu
+++ b/debian/lenny/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
 ?package(knode):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,News"\
+	hints="TDE,News"\
 	title="KNode"\
-	icon32x32="/usr/share/pixmaps/knode.xpm"\
-	icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
 	command="/opt/trinity/bin/knode"
diff --git a/debian/lenny/tdepim/debian/knotes-trinity.menu b/debian/lenny/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/lenny/tdepim/debian/knotes-trinity.menu
+++ b/debian/lenny/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KNotes"\
-	icon32x32="/usr/share/pixmaps/knotes.xpm"\
-	icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
 	command="/opt/trinity/bin/knotes"
diff --git a/debian/lenny/tdepim/debian/kontact-trinity.menu b/debian/lenny/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/lenny/tdepim/debian/kontact-trinity.menu
+++ b/debian/lenny/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="Kontact"\
-	icon32x32="/usr/share/pixmaps/kontact.xpm"\
-	icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
 	command="/opt/trinity/bin/kontact"
diff --git a/debian/lenny/tdepim/debian/korganizer-trinity.menu b/debian/lenny/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/lenny/tdepim/debian/korganizer-trinity.menu
+++ b/debian/lenny/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KOrganizer"\
-	icon32x32="/usr/share/pixmaps/korganizer.xpm"\
-	icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
 	command="/opt/trinity/bin/korganizer"
diff --git a/debian/lenny/tdepim/debian/korn-trinity.menu b/debian/lenny/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/lenny/tdepim/debian/korn-trinity.menu
+++ b/debian/lenny/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="KOrn"\
-	icon32x32="/usr/share/pixmaps/korn.xpm"\
-	icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
 	command="/opt/trinity/bin/korn"
diff --git a/debian/lenny/tdepim/debian/ktnef-trinity.menu b/debian/lenny/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/lenny/tdepim/debian/ktnef-trinity.menu
+++ b/debian/lenny/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KTnef"\
-	icon32x32="/usr/share/pixmaps/ktnef.xpm"\
-	icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
 	command="/opt/trinity/bin/ktnef"
diff --git a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/lenny/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
-	title="KDE Groupware Wizard"\
+	title="TDE Groupware Wizard"\
 	command="/opt/trinity/bin/groupwarewizard"
 
 ?package(tdepim-wizards):\
diff --git a/debian/lenny/tdesdk/debian/cervisia-trinity.menu b/debian/lenny/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/debian/lenny/tdesdk/debian/cervisia-trinity.menu
+++ b/debian/lenny/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
 ?package(cervisia):\
   needs="x11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
+  hints="TDE,Version control"\
   title="Cervisia"\
   longtitle="Cervisia (CVS Frontend)"\
-  icon="/usr/share/pixmaps/cervisia.xpm"\
+  icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
   command="/opt/trinity/bin/cervisia"
 
diff --git a/debian/lenny/tdesdk/debian/kbabel-trinity.menu b/debian/lenny/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/debian/lenny/tdesdk/debian/kbabel-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel"\
         longtitle="KBabel (Translation Tool)"\
-        icon="/usr/share/pixmaps/kbabel.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
         command="/opt/trinity/bin/kbabel"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Dictionary"\
         longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
-        icon="/usr/share/pixmaps/kbabeldict.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
         command="/opt/trinity/bin/kbabeldict"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Catalog Manager"\
         longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
-        icon="/usr/share/pixmaps/catalogmanager.xpm"\
+        icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
         command="/opt/trinity/bin/catalogmanager"
 
diff --git a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
         section="Applications/Project Management"\
         hints="TDE"\
         title="KBugBuster"\
-        longtitle="KBugBuster (KDE Bug Management)"\
-        icon="/usr/share/pixmaps/kbugbuster.xpm"\
+        longtitle="KBugBuster (TDE Bug Management)"\
+        icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
         command="/opt/trinity/bin/kbugbuster"
diff --git a/debian/lenny/tdesdk/debian/kompare-trinity.menu b/debian/lenny/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/debian/lenny/tdesdk/debian/kompare-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
         hints="TDE"\
         title="Kompare"\
         longtitle="Kompare (Diff/Patch Frontend)"\
-        icon="/usr/share/pixmaps/kompare.xpm"\
+        icon="/opt/trinity/share/pixmaps/kompare.xpm"\
         command="/opt/trinity/bin/kompare"
 
diff --git a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/lenny/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KUIViewer"\
   longtitle="KUIViewer (Qt Designer UI File Viewer)"\
-  icon="/usr/share/pixmaps/kuiviewer.xpm"\
+  icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
   command="/opt/trinity/bin/kuiviewer"
 
diff --git a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/lenny/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KCachegrind"\
   longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
   command="/opt/trinity/bin/tdecachegrind"
 
diff --git a/debian/lenny/tdesdk/debian/umbrello-trinity.menu b/debian/lenny/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/debian/lenny/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/lenny/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="Umbrello"\
   longtitle="Umbrello (UML Modeller)"\
-  icon="/usr/share/pixmaps/umbrello.xpm"\
+  icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
   command="/opt/trinity/bin/umbrello"
 
diff --git a/debian/lenny/tdeutils/debian/ark-trinity.menu b/debian/lenny/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/debian/lenny/tdeutils/debian/ark-trinity.menu
+++ b/debian/lenny/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Ark"\
-	icon32x32="/usr/share/pixmaps/ark.xpm"\
-	icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
 	command="/opt/trinity/bin/ark"
 
 # Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/debian/lenny/tdeutils/debian/kcalc-trinity.menu b/debian/lenny/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/debian/lenny/tdeutils/debian/kcalc-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcalc):\
 	needs="X11"\
 	section="Apps/Math"\
-	hints="KDE,Calculators"\
+	hints="TDE,Calculators"\
 	title="KCalc"\
-	icon32x32="/usr/share/pixmaps/kcalc.xpm"\
-	icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
 	command="/opt/trinity/bin/kcalc"
 
 # Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/debian/lenny/tdeutils/debian/kcharselect-trinity.menu b/debian/lenny/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/debian/lenny/tdeutils/debian/kcharselect-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcharselect):\
 	needs="X11"\
 	section="Apps/Tools"\
-	hints="KDE,Characters"\
+	hints="TDE,Characters"\
 	title="KCharSelect"\
-	icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
-	icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
 	command="/opt/trinity/bin/kcharselect"
 
 # Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/debian/lenny/tdeutils/debian/kdf-trinity.menu b/debian/lenny/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/debian/lenny/tdeutils/debian/kdf-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KDiskFree"\
-	icon32x32="/usr/share/pixmaps/kdf.xpm"\
-	icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
 	command="/opt/trinity/bin/kdf"
 
 ?package(kdf):\
@@ -12,8 +12,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="kwikdisk"\
-	icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
-	icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
 	command="/opt/trinity/bin/kwikdisk"
 
 # Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
diff --git a/debian/lenny/tdeutils/debian/kedit-trinity.menu b/debian/lenny/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/debian/lenny/tdeutils/debian/kedit-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kedit):\
 	needs="X11"\
 	section="Apps/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KEdit"\
-	icon32x32="/usr/share/pixmaps/kedit.xpm"\
-	icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
 	command="/opt/trinity/bin/kedit"
 
 # Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KFloppy"\
-	icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
-	icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
 	command="/opt/trinity/bin/kfloppy"
 
 # Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/debian/lenny/tdeutils/debian/kgpg-trinity.menu b/debian/lenny/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/debian/lenny/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kgpg"\
-	icon32x32="/usr/share/pixmaps/kgpg.xpm"\
-	icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
 	command="/opt/trinity/bin/kgpg"
 
 # Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/debian/lenny/tdeutils/debian/khexedit-trinity.menu b/debian/lenny/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/debian/lenny/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/lenny/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KHexEdit"\
-	icon32x32="/usr/share/pixmaps/khexedit.xpm"\
-	icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
 	command="/opt/trinity/bin/khexedit"
 
 # Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/debian/lenny/tdeutils/debian/kjots-trinity.menu b/debian/lenny/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/debian/lenny/tdeutils/debian/kjots-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KJots"\
-	icon32x32="/usr/share/pixmaps/kjots.xpm"\
-	icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
 	command="/opt/trinity/bin/kjots"
 
 # Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/lenny/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kregexpeditor"\
-	icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
-	icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
 	command="/opt/trinity/bin/kregexpeditor"
 
 # Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/debian/lenny/tdeutils/debian/ktimer-trinity.menu b/debian/lenny/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/debian/lenny/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/lenny/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KTimer"\
-	icon32x32="/usr/share/pixmaps/ktimer.xpm"\
-	icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
 	command="/opt/trinity/bin/ktimer"
 
 # Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/lenny/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Superkaramba"\
-	icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
-	icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
 	command="/opt/trinity/bin/superkaramba"
 
 # Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/lenny/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
 ?package(tdevelop):\
         needs="X11"\
         section="Applications/Programming"\
-        hints="KDE,Development"\
+        hints="TDE,Development"\
         title="KDevelop"\
         longtitle="KDevelop (Development Environment)"\
-        icon="/usr/share/pixmaps/tdevelop.xpm"\
+        icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
         command="/opt/trinity/bin/tdevelop"
diff --git a/debian/squeeze/applications/abakus/debian/abakus-trinity.menu b/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/squeeze/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
  title="AbaKus"\
  command="/opt/trinity/bin/abakus"\
  hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/squeeze/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Sound"\
 	hints="TDE"\
 	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
 	command="/opt/trinity/bin/amarok"
diff --git a/debian/squeeze/applications/amarok/debian/amarok-trinity.menu b/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/squeeze/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Sound"\
 	hints="TDE"\
 	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
 	command="/opt/trinity/bin/amarok"
diff --git a/debian/squeeze/applications/bibletime/debian/menu b/debian/squeeze/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/debian/squeeze/applications/bibletime/debian/menu
+++ b/debian/squeeze/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
 ?package(bibletime):\
     needs="X11"\
-    hints="KDE,Bible"\
+    hints="TDE,Bible"\
     section="Applications/Education"\
     title="BibleTime"\
     icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/debian/squeeze/applications/digikam/debian/digikam-trinity.menu b/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/squeeze/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="digikam"\
-	icon32x32="/usr/share/pixmaps/digikam.xpm"\
-	icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
 	command="/opt/trinity/bin/digikam"
diff --git a/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu b/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/squeeze/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="showfoto"\
-	icon32x32="/usr/share/pixmaps/showfoto.xpm"\
-	icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
 	command="/opt/trinity/bin/showfoto"
diff --git a/debian/squeeze/applications/filelight/debian/menu b/debian/squeeze/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/debian/squeeze/applications/filelight/debian/menu
+++ b/debian/squeeze/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
 ?package(filelight):needs="X11" \
         section="Apps/System" \
-        hints="KDE, Monitoring, Files" \
+        hints="TDE, Monitoring, Files" \
         command="/opt/trinity/bin/filelight" \
         title="Filelight" \
         longtitle="Filelight: disk usage as concentric rings"
diff --git a/debian/squeeze/applications/gwenview/debian/menu b/debian/squeeze/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/debian/squeeze/applications/gwenview/debian/menu
+++ b/debian/squeeze/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
 ?package(gwenview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,Images"\
 	title="Gwenview"\
 	command="/opt/trinity/bin/gwenview"\
-	icon="/usr/share/pixmaps/gwenview.xpm"
+	icon="/opt/trinity/share/pixmaps/gwenview.xpm"
diff --git a/debian/squeeze/applications/k3b/debian/k3b-trinity.menu b/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/squeeze/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/File Management"\
 	title="K3b"\
 	command="/opt/trinity/bin/k3b"\
-	icon="/usr/share/pixmaps/k3b.xpm"
+	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/squeeze/applications/k3b/debian/k3b.menu b/debian/squeeze/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/debian/squeeze/applications/k3b/debian/k3b.menu
+++ b/debian/squeeze/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
 	needs="X11"\
 	section="Applications/File Management"\
 	title="K3b"\
-	command="/usr/bin/k3b"\
-	icon="/usr/share/pixmaps/k3b.xpm"
+	command="/opt/trinity/bin/k3b"\
+	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/squeeze/applications/kaffeine/debian/menu b/debian/squeeze/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/debian/squeeze/applications/kaffeine/debian/menu
+++ b/debian/squeeze/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
 	hints="TDE"\
 	title="Kaffeine"\
 	command="/opt/trinity/bin/kaffeine"\
-	icon="/usr/share/pixmaps/kaffeine.xpm"
+	icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
diff --git a/debian/squeeze/applications/kbarcode/debian/menu b/debian/squeeze/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/debian/squeeze/applications/kbarcode/debian/menu
+++ b/debian/squeeze/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
 ?package(kbarcode):\
   needs="X11"\
   section="Applications/Graphics"\
-  hints="KDE,Barcode"\
+  hints="TDE,Barcode"\
   title="KBarcode"\
-  command="/usr/bin/kbarcode"
+  command="/opt/trinity/bin/kbarcode"
diff --git a/debian/squeeze/applications/kcpuload/debian/menu b/debian/squeeze/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/debian/squeeze/applications/kcpuload/debian/menu
+++ b/debian/squeeze/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
   kderemove="1"\
   title="KCPULoad"\
   command="/opt/trinity/bin/kcpuload"\
-  icon="/usr/share/pixmaps/kcpuload.xpm"
+  icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/debian/squeeze/applications/kile/debian/menu b/debian/squeeze/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/debian/squeeze/applications/kile/debian/menu
+++ b/debian/squeeze/applications/kile/debian/menu
@@ -4,4 +4,4 @@
   title="Kile" \
   longtitle="Kile (LaTeX development environment)" \
   command="/opt/trinity/bin/kile" \
-  icon="/usr/share/pixmaps/kile.xpm"
+  icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/debian/squeeze/applications/knetload/debian/menu b/debian/squeeze/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/debian/squeeze/applications/knetload/debian/menu
+++ b/debian/squeeze/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
   hints="TDE"\
   title="KNetLoad"\
   command="/opt/trinity/bin/knetload"\
-  icon="/usr/share/pixmaps/knetload.xpm"
+  icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu b/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/squeeze/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
 	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/squeeze/applications/knetworkmanager8/debian/menu b/debian/squeeze/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/squeeze/applications/knetworkmanager8/debian/menu
+++ b/debian/squeeze/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
 	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu b/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
 ?package(chalk):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Bitmap"\
+	hints="TDE,Bitmap"\
 	title="Chalk"\
 	longtitle="Chalk (Image Manipulation)"\
 	icon="/opt/trinity/share/pixmaps/chalk.xpm"\
diff --git a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu b/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
 ?package(karbon):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Vector"\
+	hints="TDE,Vector"\
 	title="Karbon"\
 	longtitle="Karbon (Scalable Graphics)"\
 	icon="/opt/trinity/share/pixmaps/karbon.xpm"\
diff --git a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu b/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kchart):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Graphs"\
+	hints="TDE,Graphs"\
 	title="KChart"\
 	longtitle="KChart (Charting)"\
 	icon="/opt/trinity/share/pixmaps/kchart.xpm"\
diff --git a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu b/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kivio):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Vector"\
+	hints="TDE,Vector"\
 	title="Kivio"\
 	longtitle="Kivio (Flowchart and Diagram Editing)"\
 	icon="/opt/trinity/share/pixmaps/kivio.xpm"\
diff --git a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kpresenter):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Presentation"\
+	hints="TDE,Presentation"\
 	title="KPresenter"\
 	longtitle="KPresenter (Slide Presentations)"\
 	icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
diff --git a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu b/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kspread):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Spreadsheets"\
+	hints="TDE,Spreadsheets"\
 	title="KSpread"\
 	longtitle="KSpread (Spreadsheets)"\
 	icon="/opt/trinity/share/pixmaps/kspread.xpm"\
diff --git a/debian/squeeze/applications/koffice/debian/kword-trinity.menu b/debian/squeeze/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/debian/squeeze/applications/koffice/debian/kword-trinity.menu
+++ b/debian/squeeze/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kword):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Word processors"\
+	hints="TDE,Word processors"\
 	title="KWord"\
 	longtitle="KWord (Word Processing)"\
 	icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/debian/squeeze/applications/kpicosim/debian/menu b/debian/squeeze/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/debian/squeeze/applications/kpicosim/debian/menu
+++ b/debian/squeeze/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
 ?package(kpicosim):needs="X11" section="Apps/Science"\
-  title="kpicosim" command="/usr/bin/kpicosim"
+  title="kpicosim" command="/opt/trinity/bin/kpicosim"
diff --git a/debian/squeeze/applications/kpowersave.cmake/debian/menu b/debian/squeeze/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/debian/squeeze/applications/kpowersave.cmake/debian/menu
+++ b/debian/squeeze/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
   section="Applications/System/Monitoring"\
   title="KPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
+  icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
   command="/opt/trinity/bin/kpowersave"
diff --git a/debian/squeeze/applications/krusader/debian/menu b/debian/squeeze/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/debian/squeeze/applications/krusader/debian/menu
+++ b/debian/squeeze/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
 	section="Applications/Network/File Transfer"\
 	hints="TDE"\
 	title="krusader (File Manager)"\
-	icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
-	icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
 	command="/opt/trinity/bin/krusader"
 
 ?package(krusader):\
@@ -12,6 +12,6 @@
 	section="Applications/Network/File Transfer"\
 	hints="TDE"\
 	title="krusader - root-mode (File Manager)"\
-	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
-	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
 	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/debian/squeeze/applications/ktechlab/debian/menu b/debian/squeeze/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/debian/squeeze/applications/ktechlab/debian/menu
+++ b/debian/squeeze/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
   hints="TDE" \
   title="KTechLab" \
   command="/opt/trinity/bin/ktechlab" \
-  icon="/usr/share/pixmaps/ktechlab.xpm"
+  icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
diff --git a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/squeeze/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Graphics"\
 	hints="TDE"\
 	title="Kuickshow"\
-	icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
-	icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
 	command="/opt/trinity/bin/kuickshow"
 
 # Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu b/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/squeeze/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
 ?package(potracegui):needs="X11" section="Apps/Graphics"\
   title="potracegui" command="/opt/trinity/bin/potracegui"\
-  hints="KDE frontend for tracing programs"
+  hints="TDE frontend for tracing programs"
 
diff --git a/debian/squeeze/applications/smb4k/debian/menu b/debian/squeeze/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/debian/squeeze/applications/smb4k/debian/menu
+++ b/debian/squeeze/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
         section="Applications/Network"\
 	hints="TDE"\
 	kderemove="1"\
-        title="SAMBA for KDE"\
+        title="SAMBA for TDE"\
 	longtitle="SAMBA Advanced Browser"\
         command="/opt/trinity/bin/smb4k"
diff --git a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/debian/squeeze/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
 ?package(tdesvn):\
   needs="X11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
-  title="KDESvn"\
+  hints="TDE,Version control"\
+  title="TDESvn"\
   longtitle="SVN client"\
-  icon="/usr/share/pixmaps/tdesvn.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
   command="/opt/trinity/bin/tdesvn"
diff --git a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/squeeze/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
         needs="X11"\
         section="Applications/Network/Monitoring"\
         hints="TDE"\
-        icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
-        icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+        icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+        icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
         command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
 
diff --git a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu b/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/squeeze/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Terminal Emulators"\
 	title="YaKuake"\
-	icon32x32="/usr/share/pixmaps/yakuake.xpm"\
-	icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
 	command="/opt/trinity/bin/yakuake"
 
diff --git a/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/squeeze/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
 ?package(atlantikdesigner):needs="X11"\
   section="Games/Tool"\
-  hints="KDE,Monopoly"\
+  hints="TDE,Monopoly"\
   title="Atlantik Designer"\
   longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
   command="/opt/trinity/bin/atlantikdesigner"\
diff --git a/debian/squeeze/tdeadmin/debian/kcron-trinity.menu b/debian/squeeze/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/debian/squeeze/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
-	title="KDE Task Scheduler"\
-	icon32x32="/usr/share/pixmaps/kcron.xpm"\
-	icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+	title="TDE Task Scheduler"\
+	icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
 	command="/opt/trinity/bin/kcron"
diff --git a/debian/squeeze/tdeadmin/debian/kdat-trinity.menu b/debian/squeeze/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/debian/squeeze/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/System/Hardware"\
 	hints="TDE"\
 	title="KDat"\
-	icon32x32="/usr/share/pixmaps/kdat.xpm"\
-	icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
 	command="/opt/trinity/bin/kdat"
diff --git a/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu b/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Package Management"\
 	hints="TDE"\
-	title="KDE Package Manager"\
-	icon32x32="/usr/share/pixmaps/kpackage.xpm"\
-	icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+	title="TDE Package Manager"\
+	icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
 	command="/opt/trinity/bin/kpackage"
diff --git a/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu b/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
-	title="KDE SysV-Init Editor"\
-	icon32x32="/usr/share/pixmaps/ksysv.xpm"\
-	icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+	title="TDE SysV-Init Editor"\
+	icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
 	command="/opt/trinity/bin/ksysv"
diff --git a/debian/squeeze/tdeadmin/debian/kuser-trinity.menu b/debian/squeeze/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/debian/squeeze/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/squeeze/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
-	title="KDE User Manager"\
-	icon32x32="/usr/share/pixmaps/kuser.xpm"\
-	icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+	title="TDE User Manager"\
+	icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
 	command="/opt/trinity/bin/kuser"
diff --git a/debian/squeeze/tdebase/debian/kate-trinity.menu b/debian/squeeze/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/debian/squeeze/tdebase/debian/kate-trinity.menu
+++ b/debian/squeeze/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kate):\
 	needs="X11"\
 	section="Applications/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="Kate"\
 	icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
 ?package(kate):\
 	needs="X11"\
 	section="Applications/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KWrite"\
 	icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
diff --git a/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu b/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/squeeze/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Help"\
 	hints="TDE"\
-	title="KDE Help Center"\
+	title="TDE Help Center"\
 	icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
 	command="/opt/trinity/bin/khelpcenter"
diff --git a/debian/squeeze/tdebase/debian/konqueror-trinity.menu b/debian/squeeze/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/debian/squeeze/tdebase/debian/konqueror-trinity.menu
+++ b/debian/squeeze/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
 ?package(konqueror):\
 	needs="X11"\
 	section="Applications/Network/Web Browsing"\
-	hints="KDE,Web browsers"\
+	hints="TDE,Web browsers"\
 	title="Konqueror"\
 	icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
 ?package(konqueror):\
 	needs="X11"\
 	section="Applications/File Management"\
-	hints="KDE,File managers"\
+	hints="TDE,File managers"\
 	title="Konqueror"\
 	icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
diff --git a/debian/squeeze/tdebase/debian/ksysguard-trinity.menu b/debian/squeeze/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/debian/squeeze/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/squeeze/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
-	title="KDE System Guard"\
+	title="TDE System Guard"\
 	icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
 	command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
-	title="KDE System Guard - Process Table"\
+	title="TDE System Guard - Process Table"\
 	command="/opt/trinity/bin/kpm"
 
 # Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
diff --git a/debian/squeeze/tdebase/debian/tdeprint-trinity.menu b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
-	title="KDEPrintFax"\
+	title="TDEPrintFax"\
 	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
 	command="/opt/trinity/bin/tdeprintfax"
diff --git a/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu b/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/squeeze/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
 	needs="X11"\
 	section="Applications/Programming"\
 	hints="TDE"\
-	title="KDE JavaScript Console"\
+	title="TDE JavaScript Console"\
 	command="/opt/trinity/bin/kjscmd --console --exec"
diff --git a/debian/squeeze/tdegames/debian/atlantik-trinity.menu b/debian/squeeze/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/debian/squeeze/tdegames/debian/atlantik-trinity.menu
+++ b/debian/squeeze/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
 ?package(atlantik):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Monopoly"\
+	hints="TDE,Monopoly"\
 	title="Atlantik"\
-	icon32x32="/usr/share/pixmaps/atlantik.xpm"\
-	icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
 	command="/opt/trinity/games/atlantik"
 
diff --git a/debian/squeeze/tdegames/debian/kasteroids-trinity.menu b/debian/squeeze/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/debian/squeeze/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KAsteroids"\
-	icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
-	icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
 	command="/opt/trinity/games/kasteroids"
 
diff --git a/debian/squeeze/tdegames/debian/katomic-trinity.menu b/debian/squeeze/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/debian/squeeze/tdegames/debian/katomic-trinity.menu
+++ b/debian/squeeze/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Puzzles"\
 	hints="TDE"\
-	title="KDE Atomic Entertainment"\
-	icon32x32="/usr/share/pixmaps/katomic.xpm"\
-	icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+	title="TDE Atomic Entertainment"\
+	icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
 	command="/opt/trinity/games/katomic"
 
diff --git a/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu b/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Backgammon"\
-	icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
-	icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+	title="TDE Backgammon"\
+	icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
 	command="/opt/trinity/games/kbackgammon"
 
diff --git a/debian/squeeze/tdegames/debian/kbattleship-trinity.menu b/debian/squeeze/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/debian/squeeze/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
         section="Games/Board"\
         hints="TDE"\
         title="KBattleship"\
-	icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
-	icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
         command="/opt/trinity/games/kbattleship"
diff --git a/debian/squeeze/tdegames/debian/kblackbox-trinity.menu b/debian/squeeze/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/debian/squeeze/tdegames/debian/kblackbox-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kblackbox):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,BlackBox"\
+	hints="TDE,BlackBox"\
 	title="KBlackBox"\
-	icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
-	icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
 	command="/opt/trinity/games/kblackbox"
 
diff --git a/debian/squeeze/tdegames/debian/kbounce-trinity.menu b/debian/squeeze/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/debian/squeeze/tdegames/debian/kbounce-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Bounce Ball Game"\
-	icon32x32="/usr/share/pixmaps/kbounce.xpm"\
-	icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+	title="TDE Bounce Ball Game"\
+	icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
 	command="/opt/trinity/games/kbounce"
 
diff --git a/debian/squeeze/tdegames/debian/kenolaba-trinity.menu b/debian/squeeze/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/debian/squeeze/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KEnolaba"\
-	icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
-	icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
 	command="/opt/trinity/games/kenolaba"
diff --git a/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu b/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
         needs="x11"\
         section="Games/Tetris-like"\
 	hints="TDE"\
-        title="KDE Foul Eggs"\
-	icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
-	icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+        title="TDE Foul Eggs"\
+	icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
         command="/opt/trinity/games/kfouleggs"
 
diff --git a/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu b/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KGoldrunner"\
-	icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
-	icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
 	command="/opt/trinity/games/kgoldrunner"
 
diff --git a/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu b/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="KJumpingCube"\
-	icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
-	icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
 	command="/opt/trinity/games/kjumpingcube"
 
diff --git a/debian/squeeze/tdegames/debian/klickety-trinity.menu b/debian/squeeze/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/debian/squeeze/tdegames/debian/klickety-trinity.menu
+++ b/debian/squeeze/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Puzzles"\
 	hints="TDE"\
 	title="Klickety"\
-	icon32x32="/usr/share/pixmaps/klickety.xpm"\
-	icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
 	command="/opt/trinity/games/klickety"
 
diff --git a/debian/squeeze/tdegames/debian/klines-trinity.menu b/debian/squeeze/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/debian/squeeze/tdegames/debian/klines-trinity.menu
+++ b/debian/squeeze/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KLines"\
-	icon32x32="/usr/share/pixmaps/klines.xpm"\
-	icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
 	command="/opt/trinity/games/klines"
diff --git a/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu b/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmahjongg):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Mahjongg"\
+	hints="TDE,Mahjongg"\
 	title="KMahjongg"\
-	icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
-	icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
 	command="/opt/trinity/games/kmahjongg"
 
diff --git a/debian/squeeze/tdegames/debian/kmines-trinity.menu b/debian/squeeze/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/debian/squeeze/tdegames/debian/kmines-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmines):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="Kmines"\
-	icon32x32="/usr/share/pixmaps/kmines.xpm"\
-	icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
 	command="/opt/trinity/games/kmines"
 
diff --git a/debian/squeeze/tdegames/debian/knetwalk-trinity.menu b/debian/squeeze/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/debian/squeeze/tdegames/debian/knetwalk-trinity.menu
+++ b/debian/squeeze/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
 ?package(knetwalk):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="KNetwalk"\
-	icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
-	icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
 	command="/opt/trinity/games/knetwalk"
 
diff --git a/debian/squeeze/tdegames/debian/kolf-trinity.menu b/debian/squeeze/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/debian/squeeze/tdegames/debian/kolf-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Miniature Golf"\
-	icon32x32="/usr/share/pixmaps/kolf.xpm"\
-	icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+	title="TDE Miniature Golf"\
+	icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
 	command="/opt/trinity/games/kolf"
 
diff --git a/debian/squeeze/tdegames/debian/konquest-trinity.menu b/debian/squeeze/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/debian/squeeze/tdegames/debian/konquest-trinity.menu
+++ b/debian/squeeze/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="Konquest"\
-	icon32x32="/usr/share/pixmaps/konquest.xpm"\
-	icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
 	command="/opt/trinity/games/konquest"
 
diff --git a/debian/squeeze/tdegames/debian/kpat-trinity.menu b/debian/squeeze/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/debian/squeeze/tdegames/debian/kpat-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Patience"\
-	icon32x32="/usr/share/pixmaps/kpat.xpm"\
-	icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+	title="TDE Patience"\
+	icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
 	command="/opt/trinity/games/kpat"
 
diff --git a/debian/squeeze/tdegames/debian/kpoker-trinity.menu b/debian/squeeze/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/debian/squeeze/tdegames/debian/kpoker-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Poker"\
-	icon32x32="/usr/share/pixmaps/kpoker.xpm"\
-	icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+	title="TDE Poker"\
+	icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
 	command="/opt/trinity/games/kpoker"
 
diff --git a/debian/squeeze/tdegames/debian/kreversi-trinity.menu b/debian/squeeze/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/debian/squeeze/tdegames/debian/kreversi-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Reversi"\
-	icon32x32="/usr/share/pixmaps/kreversi.xpm"\
-	icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+	title="TDE Reversi"\
+	icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
 	command="/opt/trinity/games/kreversi"
 
diff --git a/debian/squeeze/tdegames/debian/ksame-trinity.menu b/debian/squeeze/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/debian/squeeze/tdegames/debian/ksame-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksame):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,SameGame"\
-	title="KDE SameGame"\
-	icon32x32="/usr/share/pixmaps/ksame.xpm"\
-	icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+	hints="TDE,SameGame"\
+	title="TDE SameGame"\
+	icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
 	command="/opt/trinity/games/ksame"
 
diff --git a/debian/squeeze/tdegames/debian/kshisen-trinity.menu b/debian/squeeze/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/debian/squeeze/tdegames/debian/kshisen-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Shisen-Sho"\
-	icon32x32="/usr/share/pixmaps/kshisen.xpm"\
-	icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+	title="TDE Shisen-Sho"\
+	icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
 	command="/opt/trinity/games/kshisen"
 
diff --git a/debian/squeeze/tdegames/debian/ksirtet-trinity.menu b/debian/squeeze/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/debian/squeeze/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Sirtet"\
-	icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
-	icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+	title="TDE Sirtet"\
+	icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
 	command="/opt/trinity/games/ksirtet"
 
diff --git a/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu b/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Smiletris"\
-	icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
-	icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+	title="TDE Smiletris"\
+	icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
 	command="/opt/trinity/games/ksmiletris"
 
diff --git a/debian/squeeze/tdegames/debian/ksnake-trinity.menu b/debian/squeeze/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/debian/squeeze/tdegames/debian/ksnake-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Snake Race"\
-	icon32x32="/usr/share/pixmaps/ksnake.xpm"\
-	icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+	title="TDE Snake Race"\
+	icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
 	command="/opt/trinity/games/ksnake"
 
diff --git a/debian/squeeze/tdegames/debian/ksokoban-trinity.menu b/debian/squeeze/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/debian/squeeze/tdegames/debian/ksokoban-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksokoban):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Sokoban"\
-	title="KDE Sokoban"\
-	icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
-	icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+	hints="TDE,Sokoban"\
+	title="TDE Sokoban"\
+	icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
 	command="/opt/trinity/games/ksokoban"
 
diff --git a/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu b/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE SpaceDuel"\
-	icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
-	icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+	title="TDE SpaceDuel"\
+	icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
 	command="/opt/trinity/games/kspaceduel"
 
diff --git a/debian/squeeze/tdegames/debian/ktron-trinity.menu b/debian/squeeze/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/debian/squeeze/tdegames/debian/ktron-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Tron"\
-	icon32x32="/usr/share/pixmaps/ktron.xpm"\
-	icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+	title="TDE Tron"\
+	icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
 	command="/opt/trinity/games/ktron"
 
diff --git a/debian/squeeze/tdegames/debian/ktuberling-trinity.menu b/debian/squeeze/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/debian/squeeze/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/squeeze/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
-	title="KDE Potato Guy"\
-	icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
-	icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+	title="TDE Potato Guy"\
+	icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
 	command="/opt/trinity/games/ktuberling"
 
diff --git a/debian/squeeze/tdegames/debian/kwin4-trinity.menu b/debian/squeeze/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/debian/squeeze/tdegames/debian/kwin4-trinity.menu
+++ b/debian/squeeze/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KWin4"\
-	icon32x32="/usr/share/pixmaps/twin4.xpm"\
-	icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
 	command="/opt/trinity/games/twin4"
 
diff --git a/debian/squeeze/tdegames/debian/lskat-trinity.menu b/debian/squeeze/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/debian/squeeze/tdegames/debian/lskat-trinity.menu
+++ b/debian/squeeze/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Lieutnant Skat"\
-	icon32x32="/usr/share/pixmaps/lskat.xpm"\
-	icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+	title="TDE Lieutnant Skat"\
+	icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
 	command="/opt/trinity/games/lskat"
 
diff --git a/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu b/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kdvi):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,DVI,Documents"\
+	hints="TDE,DVI,Documents"\
 	title="KDVI"\
 	icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
diff --git a/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu b/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kghostview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Documents"\
+	hints="TDE,Documents"\
 	title="KGhostView"\
 	icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
diff --git a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kpovmodeler):\
 	needs="X11"\
 	section="Applications/Graphics"\
-	hints="KDE,Modeler"\
+	hints="TDE,Modeler"\
 	title="KPovModeler"\
 	icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
diff --git a/debian/squeeze/tdegraphics/debian/kview-trinity.menu b/debian/squeeze/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/debian/squeeze/tdegraphics/debian/kview-trinity.menu
+++ b/debian/squeeze/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,Images"\
 	title="KView"\
 	icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
diff --git a/debian/squeeze/tdenetwork/debian/kopete-trinity.menu b/debian/squeeze/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/debian/squeeze/tdenetwork/debian/kopete-trinity.menu
+++ b/debian/squeeze/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kopete):\
 	needs="X11"\
 	section="Apps/Net"\
-	hints="KDE,IM"\
+	hints="TDE,IM"\
 	title="Kopete"\
 	icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
diff --git a/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu b/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu
+++ b/debian/squeeze/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
 ?package(ksirc):\
 	needs="X11"\
 	section="Apps/Net"\
-	hints="KDE,IRC"\
+	hints="TDE,IRC"\
 	title="KSirc"\
 	icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
diff --git a/debian/squeeze/tdepim/debian/akregator-trinity.menu b/debian/squeeze/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/squeeze/tdepim/debian/akregator-trinity.menu
+++ b/debian/squeeze/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="aKregator"\
-	icon32x32="/usr/share/pixmaps/akregator.xpm"\
-	icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
 	command="/opt/trinity/bin/akregator"
diff --git a/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu b/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAddressbook"\
-	icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
-	icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
 	command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/squeeze/tdepim/debian/kalarm-trinity.menu b/debian/squeeze/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/squeeze/tdepim/debian/kalarm-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAlarm"\
-	icon32x32="/usr/share/pixmaps/kalarm.xpm"\
-	icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
 	command="/opt/trinity/bin/kalarm"
diff --git a/debian/squeeze/tdepim/debian/karm-trinity.menu b/debian/squeeze/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/squeeze/tdepim/debian/karm-trinity.menu
+++ b/debian/squeeze/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Project Management"\
 	hints="TDE"\
 	title="KArm"\
-	icon32x32="/usr/share/pixmaps/karm.xpm"\
-	icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
 	command="/opt/trinity/bin/karm"
diff --git a/debian/squeeze/tdepim/debian/kmail-trinity.menu b/debian/squeeze/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/squeeze/tdepim/debian/kmail-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
 ?package(kmail):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail"\
-	icon32x32="/usr/share/pixmaps/kmail.xpm"\
-	icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
 	command="/opt/trinity/bin/kmail"
diff --git a/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu b/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
 ?package(kmailcvt):\
 	needs="X11"\
 	section="Applications/Data Management"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail/KAB Import Tool"\
 	command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/squeeze/tdepim/debian/knode-trinity.menu b/debian/squeeze/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/squeeze/tdepim/debian/knode-trinity.menu
+++ b/debian/squeeze/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
 ?package(knode):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,News"\
+	hints="TDE,News"\
 	title="KNode"\
-	icon32x32="/usr/share/pixmaps/knode.xpm"\
-	icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
 	command="/opt/trinity/bin/knode"
diff --git a/debian/squeeze/tdepim/debian/knotes-trinity.menu b/debian/squeeze/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/squeeze/tdepim/debian/knotes-trinity.menu
+++ b/debian/squeeze/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KNotes"\
-	icon32x32="/usr/share/pixmaps/knotes.xpm"\
-	icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
 	command="/opt/trinity/bin/knotes"
diff --git a/debian/squeeze/tdepim/debian/kontact-trinity.menu b/debian/squeeze/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/squeeze/tdepim/debian/kontact-trinity.menu
+++ b/debian/squeeze/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="Kontact"\
-	icon32x32="/usr/share/pixmaps/kontact.xpm"\
-	icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
 	command="/opt/trinity/bin/kontact"
diff --git a/debian/squeeze/tdepim/debian/korganizer-trinity.menu b/debian/squeeze/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/squeeze/tdepim/debian/korganizer-trinity.menu
+++ b/debian/squeeze/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KOrganizer"\
-	icon32x32="/usr/share/pixmaps/korganizer.xpm"\
-	icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
 	command="/opt/trinity/bin/korganizer"
diff --git a/debian/squeeze/tdepim/debian/korn-trinity.menu b/debian/squeeze/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/squeeze/tdepim/debian/korn-trinity.menu
+++ b/debian/squeeze/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="KOrn"\
-	icon32x32="/usr/share/pixmaps/korn.xpm"\
-	icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
 	command="/opt/trinity/bin/korn"
diff --git a/debian/squeeze/tdepim/debian/ktnef-trinity.menu b/debian/squeeze/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/squeeze/tdepim/debian/ktnef-trinity.menu
+++ b/debian/squeeze/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KTnef"\
-	icon32x32="/usr/share/pixmaps/ktnef.xpm"\
-	icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
 	command="/opt/trinity/bin/ktnef"
diff --git a/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu b/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/squeeze/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
-	title="KDE Groupware Wizard"\
+	title="TDE Groupware Wizard"\
 	command="/opt/trinity/bin/groupwarewizard"
 
 ?package(tdepim-wizards):\
diff --git a/debian/squeeze/tdesdk/debian/cervisia-trinity.menu b/debian/squeeze/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/debian/squeeze/tdesdk/debian/cervisia-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
 ?package(cervisia):\
   needs="x11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
+  hints="TDE,Version control"\
   title="Cervisia"\
   longtitle="Cervisia (CVS Frontend)"\
-  icon="/usr/share/pixmaps/cervisia.xpm"\
+  icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
   command="/opt/trinity/bin/cervisia"
 
diff --git a/debian/squeeze/tdesdk/debian/kbabel-trinity.menu b/debian/squeeze/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/debian/squeeze/tdesdk/debian/kbabel-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel"\
         longtitle="KBabel (Translation Tool)"\
-        icon="/usr/share/pixmaps/kbabel.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
         command="/opt/trinity/bin/kbabel"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Dictionary"\
         longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
-        icon="/usr/share/pixmaps/kbabeldict.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
         command="/opt/trinity/bin/kbabeldict"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Catalog Manager"\
         longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
-        icon="/usr/share/pixmaps/catalogmanager.xpm"\
+        icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
         command="/opt/trinity/bin/catalogmanager"
 
diff --git a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
         section="Applications/Project Management"\
         hints="TDE"\
         title="KBugBuster"\
-        longtitle="KBugBuster (KDE Bug Management)"\
-        icon="/usr/share/pixmaps/kbugbuster.xpm"\
+        longtitle="KBugBuster (TDE Bug Management)"\
+        icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
         command="/opt/trinity/bin/kbugbuster"
diff --git a/debian/squeeze/tdesdk/debian/kompare-trinity.menu b/debian/squeeze/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/debian/squeeze/tdesdk/debian/kompare-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
         hints="TDE"\
         title="Kompare"\
         longtitle="Kompare (Diff/Patch Frontend)"\
-        icon="/usr/share/pixmaps/kompare.xpm"\
+        icon="/opt/trinity/share/pixmaps/kompare.xpm"\
         command="/opt/trinity/bin/kompare"
 
diff --git a/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu b/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KUIViewer"\
   longtitle="KUIViewer (Qt Designer UI File Viewer)"\
-  icon="/usr/share/pixmaps/kuiviewer.xpm"\
+  icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
   command="/opt/trinity/bin/kuiviewer"
 
diff --git a/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KCachegrind"\
   longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
   command="/opt/trinity/bin/tdecachegrind"
 
diff --git a/debian/squeeze/tdesdk/debian/umbrello-trinity.menu b/debian/squeeze/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/debian/squeeze/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/squeeze/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="Umbrello"\
   longtitle="Umbrello (UML Modeller)"\
-  icon="/usr/share/pixmaps/umbrello.xpm"\
+  icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
   command="/opt/trinity/bin/umbrello"
 
diff --git a/debian/squeeze/tdeutils/debian/ark-trinity.menu b/debian/squeeze/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/debian/squeeze/tdeutils/debian/ark-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Ark"\
-	icon32x32="/usr/share/pixmaps/ark.xpm"\
-	icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
 	command="/opt/trinity/bin/ark"
 
 # Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/debian/squeeze/tdeutils/debian/kcalc-trinity.menu b/debian/squeeze/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/debian/squeeze/tdeutils/debian/kcalc-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcalc):\
 	needs="X11"\
 	section="Apps/Math"\
-	hints="KDE,Calculators"\
+	hints="TDE,Calculators"\
 	title="KCalc"\
-	icon32x32="/usr/share/pixmaps/kcalc.xpm"\
-	icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
 	command="/opt/trinity/bin/kcalc"
 
 # Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu b/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcharselect):\
 	needs="X11"\
 	section="Apps/Tools"\
-	hints="KDE,Characters"\
+	hints="TDE,Characters"\
 	title="KCharSelect"\
-	icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
-	icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
 	command="/opt/trinity/bin/kcharselect"
 
 # Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/debian/squeeze/tdeutils/debian/kdf-trinity.menu b/debian/squeeze/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/debian/squeeze/tdeutils/debian/kdf-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KDiskFree"\
-	icon32x32="/usr/share/pixmaps/kdf.xpm"\
-	icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
 	command="/opt/trinity/bin/kdf"
 
 ?package(kdf):\
@@ -12,8 +12,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="kwikdisk"\
-	icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
-	icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
 	command="/opt/trinity/bin/kwikdisk"
 
 # Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
diff --git a/debian/squeeze/tdeutils/debian/kedit-trinity.menu b/debian/squeeze/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/debian/squeeze/tdeutils/debian/kedit-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kedit):\
 	needs="X11"\
 	section="Apps/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KEdit"\
-	icon32x32="/usr/share/pixmaps/kedit.xpm"\
-	icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
 	command="/opt/trinity/bin/kedit"
 
 # Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu b/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KFloppy"\
-	icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
-	icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
 	command="/opt/trinity/bin/kfloppy"
 
 # Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/debian/squeeze/tdeutils/debian/kgpg-trinity.menu b/debian/squeeze/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/debian/squeeze/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kgpg"\
-	icon32x32="/usr/share/pixmaps/kgpg.xpm"\
-	icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
 	command="/opt/trinity/bin/kgpg"
 
 # Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/debian/squeeze/tdeutils/debian/khexedit-trinity.menu b/debian/squeeze/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/debian/squeeze/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KHexEdit"\
-	icon32x32="/usr/share/pixmaps/khexedit.xpm"\
-	icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
 	command="/opt/trinity/bin/khexedit"
 
 # Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/debian/squeeze/tdeutils/debian/kjots-trinity.menu b/debian/squeeze/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/debian/squeeze/tdeutils/debian/kjots-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KJots"\
-	icon32x32="/usr/share/pixmaps/kjots.xpm"\
-	icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
 	command="/opt/trinity/bin/kjots"
 
 # Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu b/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kregexpeditor"\
-	icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
-	icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
 	command="/opt/trinity/bin/kregexpeditor"
 
 # Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/debian/squeeze/tdeutils/debian/ktimer-trinity.menu b/debian/squeeze/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/debian/squeeze/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KTimer"\
-	icon32x32="/usr/share/pixmaps/ktimer.xpm"\
-	icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
 	command="/opt/trinity/bin/ktimer"
 
 # Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu b/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/squeeze/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Superkaramba"\
-	icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
-	icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
 	command="/opt/trinity/bin/superkaramba"
 
 # Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu b/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/squeeze/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
 ?package(tdevelop):\
         needs="X11"\
         section="Applications/Programming"\
-        hints="KDE,Development"\
+        hints="TDE,Development"\
         title="KDevelop"\
         longtitle="KDevelop (Development Environment)"\
-        icon="/usr/share/pixmaps/tdevelop.xpm"\
+        icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
         command="/opt/trinity/bin/tdevelop"
diff --git a/debian/wheezy/applications/abakus/debian/abakus-trinity.menu b/debian/wheezy/applications/abakus/debian/abakus-trinity.menu
index 7692affbf..bd59ecd41 100644
--- a/debian/wheezy/applications/abakus/debian/abakus-trinity.menu
+++ b/debian/wheezy/applications/abakus/debian/abakus-trinity.menu
@@ -3,4 +3,4 @@
  title="AbaKus"\
  command="/opt/trinity/bin/abakus"\
  hints="TDE"\
- icon="/usr/share/pixmaps/abakus.xpm"
+ icon="/opt/trinity/share/pixmaps/abakus.xpm"
diff --git a/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu b/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu
+++ b/debian/wheezy/applications/amarok.cmake/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Sound"\
 	hints="TDE"\
 	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
 	command="/opt/trinity/bin/amarok"
diff --git a/debian/wheezy/applications/amarok/debian/amarok-trinity.menu b/debian/wheezy/applications/amarok/debian/amarok-trinity.menu
index 7bd18dffa..51d4e1f8b 100644
--- a/debian/wheezy/applications/amarok/debian/amarok-trinity.menu
+++ b/debian/wheezy/applications/amarok/debian/amarok-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Sound"\
 	hints="TDE"\
 	title="Amarok"\
-	icon32x32="/usr/share/pixmaps/amarok.xpm"\
-	icon16x16="/usr/share/pixmaps/amarok-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/amarok.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/amarok-16.xpm"\
 	command="/opt/trinity/bin/amarok"
diff --git a/debian/wheezy/applications/bibletime/debian/menu b/debian/wheezy/applications/bibletime/debian/menu
index 7ba4e395f..cf2c01b5d 100644
--- a/debian/wheezy/applications/bibletime/debian/menu
+++ b/debian/wheezy/applications/bibletime/debian/menu
@@ -1,6 +1,6 @@
 ?package(bibletime):\
     needs="X11"\
-    hints="KDE,Bible"\
+    hints="TDE,Bible"\
     section="Applications/Education"\
     title="BibleTime"\
     icon="/opt/trinity/share/pixmaps/bibletime.xpm"\
diff --git a/debian/wheezy/applications/digikam/debian/digikam-trinity.menu b/debian/wheezy/applications/digikam/debian/digikam-trinity.menu
index 949e0fba8..e4f9ec786 100644
--- a/debian/wheezy/applications/digikam/debian/digikam-trinity.menu
+++ b/debian/wheezy/applications/digikam/debian/digikam-trinity.menu
@@ -2,6 +2,6 @@
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="digikam"\
-	icon32x32="/usr/share/pixmaps/digikam.xpm"\
-	icon16x16="/usr/share/pixmaps/digikam-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/digikam.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/digikam-16.xpm"\
 	command="/opt/trinity/bin/digikam"
diff --git a/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu b/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu
index 32ce26612..4210733e4 100644
--- a/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu
+++ b/debian/wheezy/applications/digikam/debian/showfoto-trinity.menu
@@ -2,6 +2,6 @@
 	needs="X11"\
 	section="Applications/Viewers"\
 	title="showfoto"\
-	icon32x32="/usr/share/pixmaps/showfoto.xpm"\
-	icon16x16="/usr/share/pixmaps/showfoto-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/showfoto.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/showfoto-16.xpm"\
 	command="/opt/trinity/bin/showfoto"
diff --git a/debian/wheezy/applications/filelight/debian/menu b/debian/wheezy/applications/filelight/debian/menu
index 4db4c3f62..db52bceb9 100644
--- a/debian/wheezy/applications/filelight/debian/menu
+++ b/debian/wheezy/applications/filelight/debian/menu
@@ -1,6 +1,6 @@
 ?package(filelight):needs="X11" \
         section="Apps/System" \
-        hints="KDE, Monitoring, Files" \
+        hints="TDE, Monitoring, Files" \
         command="/opt/trinity/bin/filelight" \
         title="Filelight" \
         longtitle="Filelight: disk usage as concentric rings"
diff --git a/debian/wheezy/applications/gwenview/debian/menu b/debian/wheezy/applications/gwenview/debian/menu
index c20d8c34c..c139009e3 100644
--- a/debian/wheezy/applications/gwenview/debian/menu
+++ b/debian/wheezy/applications/gwenview/debian/menu
@@ -1,7 +1,7 @@
 ?package(gwenview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,Images"\
 	title="Gwenview"\
 	command="/opt/trinity/bin/gwenview"\
-	icon="/usr/share/pixmaps/gwenview.xpm"
+	icon="/opt/trinity/share/pixmaps/gwenview.xpm"
diff --git a/debian/wheezy/applications/k3b/debian/k3b-trinity.menu b/debian/wheezy/applications/k3b/debian/k3b-trinity.menu
index f07382ed8..52a67ba44 100644
--- a/debian/wheezy/applications/k3b/debian/k3b-trinity.menu
+++ b/debian/wheezy/applications/k3b/debian/k3b-trinity.menu
@@ -3,4 +3,4 @@
 	section="Applications/File Management"\
 	title="K3b"\
 	command="/opt/trinity/bin/k3b"\
-	icon="/usr/share/pixmaps/k3b.xpm"
+	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/wheezy/applications/k3b/debian/k3b.menu b/debian/wheezy/applications/k3b/debian/k3b.menu
index c6f95c029..52a67ba44 100644
--- a/debian/wheezy/applications/k3b/debian/k3b.menu
+++ b/debian/wheezy/applications/k3b/debian/k3b.menu
@@ -2,5 +2,5 @@
 	needs="X11"\
 	section="Applications/File Management"\
 	title="K3b"\
-	command="/usr/bin/k3b"\
-	icon="/usr/share/pixmaps/k3b.xpm"
+	command="/opt/trinity/bin/k3b"\
+	icon="/opt/trinity/share/pixmaps/k3b.xpm"
diff --git a/debian/wheezy/applications/kaffeine/debian/menu b/debian/wheezy/applications/kaffeine/debian/menu
index c9f3a50ac..50780b0a2 100644
--- a/debian/wheezy/applications/kaffeine/debian/menu
+++ b/debian/wheezy/applications/kaffeine/debian/menu
@@ -4,4 +4,4 @@
 	hints="TDE"\
 	title="Kaffeine"\
 	command="/opt/trinity/bin/kaffeine"\
-	icon="/usr/share/pixmaps/kaffeine.xpm"
+	icon="/opt/trinity/share/pixmaps/kaffeine.xpm"
diff --git a/debian/wheezy/applications/kbarcode/debian/menu b/debian/wheezy/applications/kbarcode/debian/menu
index 48b3f8eff..e27b90141 100644
--- a/debian/wheezy/applications/kbarcode/debian/menu
+++ b/debian/wheezy/applications/kbarcode/debian/menu
@@ -1,6 +1,6 @@
 ?package(kbarcode):\
   needs="X11"\
   section="Applications/Graphics"\
-  hints="KDE,Barcode"\
+  hints="TDE,Barcode"\
   title="KBarcode"\
-  command="/usr/bin/kbarcode"
+  command="/opt/trinity/bin/kbarcode"
diff --git a/debian/wheezy/applications/kcpuload/debian/menu b/debian/wheezy/applications/kcpuload/debian/menu
index 181ec82e6..1ae39c62a 100644
--- a/debian/wheezy/applications/kcpuload/debian/menu
+++ b/debian/wheezy/applications/kcpuload/debian/menu
@@ -4,4 +4,4 @@
   kderemove="1"\
   title="KCPULoad"\
   command="/opt/trinity/bin/kcpuload"\
-  icon="/usr/share/pixmaps/kcpuload.xpm"
+  icon="/opt/trinity/share/pixmaps/kcpuload.xpm"
diff --git a/debian/wheezy/applications/kile/debian/menu b/debian/wheezy/applications/kile/debian/menu
index 2d5ca41b0..1ab2d756b 100644
--- a/debian/wheezy/applications/kile/debian/menu
+++ b/debian/wheezy/applications/kile/debian/menu
@@ -4,4 +4,4 @@
   title="Kile" \
   longtitle="Kile (LaTeX development environment)" \
   command="/opt/trinity/bin/kile" \
-  icon="/usr/share/pixmaps/kile.xpm"
+  icon="/opt/trinity/share/pixmaps/kile.xpm"
diff --git a/debian/wheezy/applications/knetload/debian/menu b/debian/wheezy/applications/knetload/debian/menu
index d6e27b1a4..4a380d449 100644
--- a/debian/wheezy/applications/knetload/debian/menu
+++ b/debian/wheezy/applications/knetload/debian/menu
@@ -3,4 +3,4 @@
   hints="TDE"\
   title="KNetLoad"\
   command="/opt/trinity/bin/knetload"\
-  icon="/usr/share/pixmaps/knetload.xpm"
+  icon="/opt/trinity/share/pixmaps/knetload.xpm"
diff --git a/debian/wheezy/applications/knetworkmanager.cmake/debian/menu b/debian/wheezy/applications/knetworkmanager.cmake/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/wheezy/applications/knetworkmanager.cmake/debian/menu
+++ b/debian/wheezy/applications/knetworkmanager.cmake/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
 	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/wheezy/applications/knetworkmanager8/debian/menu b/debian/wheezy/applications/knetworkmanager8/debian/menu
index 9775e9c7c..3853fafff 100644
--- a/debian/wheezy/applications/knetworkmanager8/debian/menu
+++ b/debian/wheezy/applications/knetworkmanager8/debian/menu
@@ -1,6 +1,6 @@
-?package(network-manager-kde): \
+?package(network-manager-tde): \
 	needs="X11" \
 	section="Applications/Network/Monitoring" \
   	title="KNetworkManager" \
-	longtitle="A KDE frontend for NetworkManager" \
+	longtitle="A TDE frontend for NetworkManager" \
 	command="/opt/trinity/bin/knetworkmanager"
diff --git a/debian/wheezy/applications/koffice/debian/chalk-trinity.menu b/debian/wheezy/applications/koffice/debian/chalk-trinity.menu
index 2354092d2..d5c662a09 100644
--- a/debian/wheezy/applications/koffice/debian/chalk-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/chalk-trinity.menu
@@ -1,7 +1,7 @@
 ?package(chalk):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Bitmap"\
+	hints="TDE,Bitmap"\
 	title="Chalk"\
 	longtitle="Chalk (Image Manipulation)"\
 	icon="/opt/trinity/share/pixmaps/chalk.xpm"\
diff --git a/debian/wheezy/applications/koffice/debian/karbon-trinity.menu b/debian/wheezy/applications/koffice/debian/karbon-trinity.menu
index 0329fc505..b44ea5b50 100644
--- a/debian/wheezy/applications/koffice/debian/karbon-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/karbon-trinity.menu
@@ -1,7 +1,7 @@
 ?package(karbon):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Vector"\
+	hints="TDE,Vector"\
 	title="Karbon"\
 	longtitle="Karbon (Scalable Graphics)"\
 	icon="/opt/trinity/share/pixmaps/karbon.xpm"\
diff --git a/debian/wheezy/applications/koffice/debian/kchart-trinity.menu b/debian/wheezy/applications/koffice/debian/kchart-trinity.menu
index 405e19fec..5939ec5d4 100644
--- a/debian/wheezy/applications/koffice/debian/kchart-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kchart-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kchart):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Graphs"\
+	hints="TDE,Graphs"\
 	title="KChart"\
 	longtitle="KChart (Charting)"\
 	icon="/opt/trinity/share/pixmaps/kchart.xpm"\
diff --git a/debian/wheezy/applications/koffice/debian/kivio-trinity.menu b/debian/wheezy/applications/koffice/debian/kivio-trinity.menu
index db45a4245..ea5177019 100644
--- a/debian/wheezy/applications/koffice/debian/kivio-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kivio-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kivio):\
 	needs="x11"\
 	section="Applications/Graphics"\
-	hints="KDE,Vector"\
+	hints="TDE,Vector"\
 	title="Kivio"\
 	longtitle="Kivio (Flowchart and Diagram Editing)"\
 	icon="/opt/trinity/share/pixmaps/kivio.xpm"\
diff --git a/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu b/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu
index 52bff66e1..dda510fcf 100644
--- a/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kpresenter-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kpresenter):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Presentation"\
+	hints="TDE,Presentation"\
 	title="KPresenter"\
 	longtitle="KPresenter (Slide Presentations)"\
 	icon="/opt/trinity/share/pixmaps/kpresenter.xpm"\
diff --git a/debian/wheezy/applications/koffice/debian/kspread-trinity.menu b/debian/wheezy/applications/koffice/debian/kspread-trinity.menu
index 8a6987024..d3cec2c14 100644
--- a/debian/wheezy/applications/koffice/debian/kspread-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kspread-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kspread):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Spreadsheets"\
+	hints="TDE,Spreadsheets"\
 	title="KSpread"\
 	longtitle="KSpread (Spreadsheets)"\
 	icon="/opt/trinity/share/pixmaps/kspread.xpm"\
diff --git a/debian/wheezy/applications/koffice/debian/kword-trinity.menu b/debian/wheezy/applications/koffice/debian/kword-trinity.menu
index 2dfdc2579..ce452d45d 100644
--- a/debian/wheezy/applications/koffice/debian/kword-trinity.menu
+++ b/debian/wheezy/applications/koffice/debian/kword-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kword):\
 	needs="x11"\
 	section="Applications/Office"\
-	hints="KDE,Word processors"\
+	hints="TDE,Word processors"\
 	title="KWord"\
 	longtitle="KWord (Word Processing)"\
 	icon="/opt/trinity/share/pixmaps/kword.xpm"\
diff --git a/debian/wheezy/applications/kpicosim/debian/menu b/debian/wheezy/applications/kpicosim/debian/menu
index 12de54d49..d62b7dcb0 100644
--- a/debian/wheezy/applications/kpicosim/debian/menu
+++ b/debian/wheezy/applications/kpicosim/debian/menu
@@ -1,2 +1,2 @@
 ?package(kpicosim):needs="X11" section="Apps/Science"\
-  title="kpicosim" command="/usr/bin/kpicosim"
+  title="kpicosim" command="/opt/trinity/bin/kpicosim"
diff --git a/debian/wheezy/applications/kpowersave.cmake/debian/menu b/debian/wheezy/applications/kpowersave.cmake/debian/menu
index 6ae0f9833..0dbd62cc4 100644
--- a/debian/wheezy/applications/kpowersave.cmake/debian/menu
+++ b/debian/wheezy/applications/kpowersave.cmake/debian/menu
@@ -3,5 +3,5 @@
   section="Applications/System/Monitoring"\
   title="KPowersave"\
   longtitle="Battery monitor and general power management"\
-  icon="/usr/share/pixmaps/kpowersave.xpm"\
+  icon="/opt/trinity/share/pixmaps/kpowersave.xpm"\
   command="/opt/trinity/bin/kpowersave"
diff --git a/debian/wheezy/applications/krusader/debian/menu b/debian/wheezy/applications/krusader/debian/menu
index 8999b22e7..be83ad7d4 100644
--- a/debian/wheezy/applications/krusader/debian/menu
+++ b/debian/wheezy/applications/krusader/debian/menu
@@ -3,8 +3,8 @@
 	section="Applications/Network/File Transfer"\
 	hints="TDE"\
 	title="krusader (File Manager)"\
-	icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
-	icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/krusader_user.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/krusader_user-16.xpm"\
 	command="/opt/trinity/bin/krusader"
 
 ?package(krusader):\
@@ -12,6 +12,6 @@
 	section="Applications/Network/File Transfer"\
 	hints="TDE"\
 	title="krusader - root-mode (File Manager)"\
-	icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
-	icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/krusader_root.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/krusader_root-16.xpm"\
 	command="tdesu -c /opt/trinity/bin/krusader"
diff --git a/debian/wheezy/applications/ktechlab/debian/menu b/debian/wheezy/applications/ktechlab/debian/menu
index bb72dd11c..400129a6c 100644
--- a/debian/wheezy/applications/ktechlab/debian/menu
+++ b/debian/wheezy/applications/ktechlab/debian/menu
@@ -3,4 +3,4 @@
   hints="TDE" \
   title="KTechLab" \
   command="/opt/trinity/bin/ktechlab" \
-  icon="/usr/share/pixmaps/ktechlab.xpm"
+  icon="/opt/trinity/share/pixmaps/ktechlab.xpm"
diff --git a/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu b/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu
index eee2e1417..eb28ff0fe 100644
--- a/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu
+++ b/debian/wheezy/applications/kuickshow/debian/kuickshow-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Graphics"\
 	hints="TDE"\
 	title="Kuickshow"\
-	icon32x32="/usr/share/pixmaps/kuickshow.xpm"\
-	icon16x16="/usr/share/pixmaps/kuickshow-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kuickshow.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuickshow-16.xpm"\
 	command="/opt/trinity/bin/kuickshow"
 
 # Icon 32x32 kuickshow/src/cr32-app-kuickshow.png kuickshow.xpm
diff --git a/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu b/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu
index ec42ba351..57290a786 100644
--- a/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu
+++ b/debian/wheezy/applications/potracegui/debian/potracegui-trinity.menu
@@ -1,4 +1,4 @@
 ?package(potracegui):needs="X11" section="Apps/Graphics"\
   title="potracegui" command="/opt/trinity/bin/potracegui"\
-  hints="KDE frontend for tracing programs"
+  hints="TDE frontend for tracing programs"
 
diff --git a/debian/wheezy/applications/smb4k/debian/menu b/debian/wheezy/applications/smb4k/debian/menu
index c56defa90..a20388544 100644
--- a/debian/wheezy/applications/smb4k/debian/menu
+++ b/debian/wheezy/applications/smb4k/debian/menu
@@ -3,6 +3,6 @@
         section="Applications/Network"\
 	hints="TDE"\
 	kderemove="1"\
-        title="SAMBA for KDE"\
+        title="SAMBA for TDE"\
 	longtitle="SAMBA Advanced Browser"\
         command="/opt/trinity/bin/smb4k"
diff --git a/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu b/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu
index 12595e540..c91c6ddce 100644
--- a/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu
+++ b/debian/wheezy/applications/tdesvn/debian/tdesvn-trinity.menu
@@ -1,8 +1,8 @@
 ?package(tdesvn):\
   needs="X11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
-  title="KDESvn"\
+  hints="TDE,Version control"\
+  title="TDESvn"\
   longtitle="SVN client"\
-  icon="/usr/share/pixmaps/tdesvn.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdesvn.xpm"\
   command="/opt/trinity/bin/tdesvn"
diff --git a/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu b/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu
index 4004b5a65..8b3f1d669 100644
--- a/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu
+++ b/debian/wheezy/applications/wlassistant/debian/wlassistant-trinity.menu
@@ -2,8 +2,8 @@
         needs="X11"\
         section="Applications/Network/Monitoring"\
         hints="TDE"\
-        icon32x32="/usr/share/pixmaps/wlassistant.xpm"\
-        icon16x16="/usr/share/pixmaps/wlassistant-16.xpm"\
+        icon32x32="/opt/trinity/share/pixmaps/wlassistant.xpm"\
+        icon16x16="/opt/trinity/share/pixmaps/wlassistant-16.xpm"\
         title="wlassistant"\
         command="/opt/trinity/bin/tdesu -X -c /opt/trinity/bin/wlassistant"
 
diff --git a/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu b/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu
index 80d76482b..2f92c629a 100644
--- a/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu
+++ b/debian/wheezy/applications/yakuake/debian/yakuake-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Terminal Emulators"\
 	title="YaKuake"\
-	icon32x32="/usr/share/pixmaps/yakuake.xpm"\
-	icon16x16="/usr/share/pixmaps/yakuake-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/yakuake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/yakuake-16.xpm"\
 	command="/opt/trinity/bin/yakuake"
 
diff --git a/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu b/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu
index 3f5845f50..f010da8d3 100644
--- a/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu
+++ b/debian/wheezy/tdeaddons/debian/atlantikdesigner-trinity.menu
@@ -1,6 +1,6 @@
 ?package(atlantikdesigner):needs="X11"\
   section="Games/Tool"\
-  hints="KDE,Monopoly"\
+  hints="TDE,Monopoly"\
   title="Atlantik Designer"\
   longtitle="Atlantik Designer (Monopoly(R)-like Board Designer)"\
   command="/opt/trinity/bin/atlantikdesigner"\
diff --git a/debian/wheezy/tdeadmin/debian/kcron-trinity.menu b/debian/wheezy/tdeadmin/debian/kcron-trinity.menu
index 40ce7f089..0bb50e9c8 100644
--- a/debian/wheezy/tdeadmin/debian/kcron-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kcron-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
-	title="KDE Task Scheduler"\
-	icon32x32="/usr/share/pixmaps/kcron.xpm"\
-	icon16x16="/usr/share/pixmaps/kcron-16.xpm"\
+	title="TDE Task Scheduler"\
+	icon32x32="/opt/trinity/share/pixmaps/kcron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcron-16.xpm"\
 	command="/opt/trinity/bin/kcron"
diff --git a/debian/wheezy/tdeadmin/debian/kdat-trinity.menu b/debian/wheezy/tdeadmin/debian/kdat-trinity.menu
index 398c54bd6..dc7ab1da7 100644
--- a/debian/wheezy/tdeadmin/debian/kdat-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kdat-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/System/Hardware"\
 	hints="TDE"\
 	title="KDat"\
-	icon32x32="/usr/share/pixmaps/kdat.xpm"\
-	icon16x16="/usr/share/pixmaps/kdat-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdat-16.xpm"\
 	command="/opt/trinity/bin/kdat"
diff --git a/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu b/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu
index 0274b1556..fb84cc32b 100644
--- a/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kpackage-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Package Management"\
 	hints="TDE"\
-	title="KDE Package Manager"\
-	icon32x32="/usr/share/pixmaps/kpackage.xpm"\
-	icon16x16="/usr/share/pixmaps/kpackage-16.xpm"\
+	title="TDE Package Manager"\
+	icon32x32="/opt/trinity/share/pixmaps/kpackage.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpackage-16.xpm"\
 	command="/opt/trinity/bin/kpackage"
diff --git a/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu b/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu
index 1da3e1e60..45353ae4b 100644
--- a/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/ksysv-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Editors"\
 	hints="TDE"\
-	title="KDE SysV-Init Editor"\
-	icon32x32="/usr/share/pixmaps/ksysv.xpm"\
-	icon16x16="/usr/share/pixmaps/ksysv-16.xpm"\
+	title="TDE SysV-Init Editor"\
+	icon32x32="/opt/trinity/share/pixmaps/ksysv.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksysv-16.xpm"\
 	command="/opt/trinity/bin/ksysv"
diff --git a/debian/wheezy/tdeadmin/debian/kuser-trinity.menu b/debian/wheezy/tdeadmin/debian/kuser-trinity.menu
index b66726e62..52d2a8afc 100644
--- a/debian/wheezy/tdeadmin/debian/kuser-trinity.menu
+++ b/debian/wheezy/tdeadmin/debian/kuser-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
-	title="KDE User Manager"\
-	icon32x32="/usr/share/pixmaps/kuser.xpm"\
-	icon16x16="/usr/share/pixmaps/kuser-16.xpm"\
+	title="TDE User Manager"\
+	icon32x32="/opt/trinity/share/pixmaps/kuser.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kuser-16.xpm"\
 	command="/opt/trinity/bin/kuser"
diff --git a/debian/wheezy/tdebase/debian/kate-trinity.menu b/debian/wheezy/tdebase/debian/kate-trinity.menu
index 378fa940e..b22f58e72 100644
--- a/debian/wheezy/tdebase/debian/kate-trinity.menu
+++ b/debian/wheezy/tdebase/debian/kate-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kate):\
 	needs="X11"\
 	section="Applications/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="Kate"\
 	icon32x32="/opt/trinity/share/pixmaps/kate.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kate-16.xpm"\
@@ -10,7 +10,7 @@
 ?package(kate):\
 	needs="X11"\
 	section="Applications/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KWrite"\
 	icon32x32="/opt/trinity/share/pixmaps/kwrite.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kwrite-16.xpm"\
diff --git a/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu b/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu
index e353cea94..06387a37b 100644
--- a/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu
+++ b/debian/wheezy/tdebase/debian/khelpcenter-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Help"\
 	hints="TDE"\
-	title="KDE Help Center"\
+	title="TDE Help Center"\
 	icon32x32="/opt/trinity/share/pixmaps/khelpcenter.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/khelpcenter-16.xpm"\
 	command="/opt/trinity/bin/khelpcenter"
diff --git a/debian/wheezy/tdebase/debian/konqueror-trinity.menu b/debian/wheezy/tdebase/debian/konqueror-trinity.menu
index 7f2ffa797..5fed6cc8e 100644
--- a/debian/wheezy/tdebase/debian/konqueror-trinity.menu
+++ b/debian/wheezy/tdebase/debian/konqueror-trinity.menu
@@ -10,7 +10,7 @@
 ?package(konqueror):\
 	needs="X11"\
 	section="Applications/Network/Web Browsing"\
-	hints="KDE,Web browsers"\
+	hints="TDE,Web browsers"\
 	title="Konqueror"\
 	icon32x32="/opt/trinity/share/pixmaps/konqueror.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/konqueror-16.xpm"\
@@ -19,7 +19,7 @@
 ?package(konqueror):\
 	needs="X11"\
 	section="Applications/File Management"\
-	hints="KDE,File managers"\
+	hints="TDE,File managers"\
 	title="Konqueror"\
 	icon32x32="/opt/trinity/share/pixmaps/kfm.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kfm-16.xpm"\
diff --git a/debian/wheezy/tdebase/debian/ksysguard-trinity.menu b/debian/wheezy/tdebase/debian/ksysguard-trinity.menu
index 5b66c9a43..efe01ba5e 100644
--- a/debian/wheezy/tdebase/debian/ksysguard-trinity.menu
+++ b/debian/wheezy/tdebase/debian/ksysguard-trinity.menu
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
-	title="KDE System Guard"\
+	title="TDE System Guard"\
 	icon32x32="/opt/trinity/share/pixmaps/ksysguard.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/ksysguard-16.xpm"\
 	command="/opt/trinity/bin/ksysguard"
@@ -11,7 +11,7 @@
 	needs="X11"\
 	section="Applications/System/Monitoring"\
 	hints="TDE"\
-	title="KDE System Guard - Process Table"\
+	title="TDE System Guard - Process Table"\
 	command="/opt/trinity/bin/kpm"
 
 # Icon 32x32 ksysguard/cr32-app-ksysguard.png ksysguard.xpm
diff --git a/debian/wheezy/tdebase/debian/tdeprint-trinity.menu b/debian/wheezy/tdebase/debian/tdeprint-trinity.menu
index 1e840a172..44d628ae7 100644
--- a/debian/wheezy/tdebase/debian/tdeprint-trinity.menu
+++ b/debian/wheezy/tdebase/debian/tdeprint-trinity.menu
@@ -20,7 +20,7 @@
 	needs="X11"\
 	section="Applications/System/Administration"\
 	hints="TDE"\
-	title="KDEPrintFax"\
+	title="TDEPrintFax"\
 	icon32x32="/opt/trinity/share/pixmaps/tdeprintfax.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/tdeprintfax-16.xpm"\
 	command="/opt/trinity/bin/tdeprintfax"
diff --git a/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu b/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu
index dce8b0826..0e5402a75 100644
--- a/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu
+++ b/debian/wheezy/tdebindings/debian/kjscmd-trinity.menu
@@ -2,5 +2,5 @@
 	needs="X11"\
 	section="Applications/Programming"\
 	hints="TDE"\
-	title="KDE JavaScript Console"\
+	title="TDE JavaScript Console"\
 	command="/opt/trinity/bin/kjscmd --console --exec"
diff --git a/debian/wheezy/tdegames/debian/atlantik-trinity.menu b/debian/wheezy/tdegames/debian/atlantik-trinity.menu
index 116271705..fe8d367a9 100644
--- a/debian/wheezy/tdegames/debian/atlantik-trinity.menu
+++ b/debian/wheezy/tdegames/debian/atlantik-trinity.menu
@@ -1,9 +1,9 @@
 ?package(atlantik):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Monopoly"\
+	hints="TDE,Monopoly"\
 	title="Atlantik"\
-	icon32x32="/usr/share/pixmaps/atlantik.xpm"\
-	icon16x16="/usr/share/pixmaps/atlantik-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/atlantik.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/atlantik-16.xpm"\
 	command="/opt/trinity/games/atlantik"
 
diff --git a/debian/wheezy/tdegames/debian/kasteroids-trinity.menu b/debian/wheezy/tdegames/debian/kasteroids-trinity.menu
index e7a7dc8af..a285649c8 100644
--- a/debian/wheezy/tdegames/debian/kasteroids-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kasteroids-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KAsteroids"\
-	icon32x32="/usr/share/pixmaps/kasteroids.xpm"\
-	icon16x16="/usr/share/pixmaps/kasteroids-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kasteroids.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kasteroids-16.xpm"\
 	command="/opt/trinity/games/kasteroids"
 
diff --git a/debian/wheezy/tdegames/debian/katomic-trinity.menu b/debian/wheezy/tdegames/debian/katomic-trinity.menu
index 3026b7fb1..9957053f3 100644
--- a/debian/wheezy/tdegames/debian/katomic-trinity.menu
+++ b/debian/wheezy/tdegames/debian/katomic-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Puzzles"\
 	hints="TDE"\
-	title="KDE Atomic Entertainment"\
-	icon32x32="/usr/share/pixmaps/katomic.xpm"\
-	icon16x16="/usr/share/pixmaps/katomic-16.xpm"\
+	title="TDE Atomic Entertainment"\
+	icon32x32="/opt/trinity/share/pixmaps/katomic.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/katomic-16.xpm"\
 	command="/opt/trinity/games/katomic"
 
diff --git a/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu b/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu
index 5a4f30f0e..6c995c404 100644
--- a/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kbackgammon-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Backgammon"\
-	icon32x32="/usr/share/pixmaps/kbackgammon.xpm"\
-	icon16x16="/usr/share/pixmaps/kbackgammon-16.xpm"\
+	title="TDE Backgammon"\
+	icon32x32="/opt/trinity/share/pixmaps/kbackgammon.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbackgammon-16.xpm"\
 	command="/opt/trinity/games/kbackgammon"
 
diff --git a/debian/wheezy/tdegames/debian/kbattleship-trinity.menu b/debian/wheezy/tdegames/debian/kbattleship-trinity.menu
index f402671bb..b8b558bd3 100644
--- a/debian/wheezy/tdegames/debian/kbattleship-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kbattleship-trinity.menu
@@ -3,6 +3,6 @@
         section="Games/Board"\
         hints="TDE"\
         title="KBattleship"\
-	icon32x32="/usr/share/pixmaps/kbattleship.xpm"\
-	icon16x16="/usr/share/pixmaps/kbattleship-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kbattleship.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbattleship-16.xpm"\
         command="/opt/trinity/games/kbattleship"
diff --git a/debian/wheezy/tdegames/debian/kblackbox-trinity.menu b/debian/wheezy/tdegames/debian/kblackbox-trinity.menu
index 008eaf055..11f768544 100644
--- a/debian/wheezy/tdegames/debian/kblackbox-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kblackbox-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kblackbox):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,BlackBox"\
+	hints="TDE,BlackBox"\
 	title="KBlackBox"\
-	icon32x32="/usr/share/pixmaps/kblackbox.xpm"\
-	icon16x16="/usr/share/pixmaps/kblackbox-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kblackbox.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kblackbox-16.xpm"\
 	command="/opt/trinity/games/kblackbox"
 
diff --git a/debian/wheezy/tdegames/debian/kbounce-trinity.menu b/debian/wheezy/tdegames/debian/kbounce-trinity.menu
index aa0d01b1e..0a253aed1 100644
--- a/debian/wheezy/tdegames/debian/kbounce-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kbounce-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Bounce Ball Game"\
-	icon32x32="/usr/share/pixmaps/kbounce.xpm"\
-	icon16x16="/usr/share/pixmaps/kbounce-16.xpm"\
+	title="TDE Bounce Ball Game"\
+	icon32x32="/opt/trinity/share/pixmaps/kbounce.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kbounce-16.xpm"\
 	command="/opt/trinity/games/kbounce"
 
diff --git a/debian/wheezy/tdegames/debian/kenolaba-trinity.menu b/debian/wheezy/tdegames/debian/kenolaba-trinity.menu
index 5786cf47b..a278ebaef 100644
--- a/debian/wheezy/tdegames/debian/kenolaba-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kenolaba-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KEnolaba"\
-	icon32x32="/usr/share/pixmaps/kenolaba.xpm"\
-	icon16x16="/usr/share/pixmaps/kenolaba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kenolaba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kenolaba-16.xpm"\
 	command="/opt/trinity/games/kenolaba"
diff --git a/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu b/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu
index 49b76d6ee..21c26ee09 100644
--- a/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kfouleggs-trinity.menu
@@ -2,8 +2,8 @@
         needs="x11"\
         section="Games/Tetris-like"\
 	hints="TDE"\
-        title="KDE Foul Eggs"\
-	icon32x32="/usr/share/pixmaps/kfouleggs.xpm"\
-	icon16x16="/usr/share/pixmaps/kfouleggs-16.xpm"\
+        title="TDE Foul Eggs"\
+	icon32x32="/opt/trinity/share/pixmaps/kfouleggs.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfouleggs-16.xpm"\
         command="/opt/trinity/games/kfouleggs"
 
diff --git a/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu b/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu
index e240fcebe..ffb4366cd 100644
--- a/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kgoldrunner-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Arcade"\
 	hints="TDE"\
 	title="KGoldrunner"\
-	icon32x32="/usr/share/pixmaps/kgoldrunner.xpm"\
-	icon16x16="/usr/share/pixmaps/kgoldrunner-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgoldrunner.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgoldrunner-16.xpm"\
 	command="/opt/trinity/games/kgoldrunner"
 
diff --git a/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu b/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu
index 5c8c3481e..67b86ee8b 100644
--- a/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kjumpingcube-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="KJumpingCube"\
-	icon32x32="/usr/share/pixmaps/kjumpingcube.xpm"\
-	icon16x16="/usr/share/pixmaps/kjumpingcube-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjumpingcube.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjumpingcube-16.xpm"\
 	command="/opt/trinity/games/kjumpingcube"
 
diff --git a/debian/wheezy/tdegames/debian/klickety-trinity.menu b/debian/wheezy/tdegames/debian/klickety-trinity.menu
index 111245dbb..c09e19b68 100644
--- a/debian/wheezy/tdegames/debian/klickety-trinity.menu
+++ b/debian/wheezy/tdegames/debian/klickety-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Puzzles"\
 	hints="TDE"\
 	title="Klickety"\
-	icon32x32="/usr/share/pixmaps/klickety.xpm"\
-	icon16x16="/usr/share/pixmaps/klickety-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klickety.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klickety-16.xpm"\
 	command="/opt/trinity/games/klickety"
 
diff --git a/debian/wheezy/tdegames/debian/klines-trinity.menu b/debian/wheezy/tdegames/debian/klines-trinity.menu
index d4ec4624a..9ae566b1a 100644
--- a/debian/wheezy/tdegames/debian/klines-trinity.menu
+++ b/debian/wheezy/tdegames/debian/klines-trinity.menu
@@ -3,6 +3,6 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KLines"\
-	icon32x32="/usr/share/pixmaps/klines.xpm"\
-	icon16x16="/usr/share/pixmaps/klines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/klines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/klines-16.xpm"\
 	command="/opt/trinity/games/klines"
diff --git a/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu b/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu
index a69063cfe..4fc4960f3 100644
--- a/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kmahjongg-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmahjongg):\
 	needs="x11"\
 	section="Games/Board"\
-	hints="KDE,Mahjongg"\
+	hints="TDE,Mahjongg"\
 	title="KMahjongg"\
-	icon32x32="/usr/share/pixmaps/kmahjongg.xpm"\
-	icon16x16="/usr/share/pixmaps/kmahjongg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmahjongg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmahjongg-16.xpm"\
 	command="/opt/trinity/games/kmahjongg"
 
diff --git a/debian/wheezy/tdegames/debian/kmines-trinity.menu b/debian/wheezy/tdegames/debian/kmines-trinity.menu
index e74163e9d..732a11666 100644
--- a/debian/wheezy/tdegames/debian/kmines-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kmines-trinity.menu
@@ -1,9 +1,9 @@
 ?package(kmines):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="Kmines"\
-	icon32x32="/usr/share/pixmaps/kmines.xpm"\
-	icon16x16="/usr/share/pixmaps/kmines-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmines.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmines-16.xpm"\
 	command="/opt/trinity/games/kmines"
 
diff --git a/debian/wheezy/tdegames/debian/knetwalk-trinity.menu b/debian/wheezy/tdegames/debian/knetwalk-trinity.menu
index 8e67087bc..c4f3a3b8a 100644
--- a/debian/wheezy/tdegames/debian/knetwalk-trinity.menu
+++ b/debian/wheezy/tdegames/debian/knetwalk-trinity.menu
@@ -1,9 +1,9 @@
 ?package(knetwalk):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Mines"\
+	hints="TDE,Mines"\
 	title="KNetwalk"\
-	icon32x32="/usr/share/pixmaps/knetwalk.xpm"\
-	icon16x16="/usr/share/pixmaps/knetwalk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knetwalk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knetwalk-16.xpm"\
 	command="/opt/trinity/games/knetwalk"
 
diff --git a/debian/wheezy/tdegames/debian/kolf-trinity.menu b/debian/wheezy/tdegames/debian/kolf-trinity.menu
index 082abe64f..76b540ffb 100644
--- a/debian/wheezy/tdegames/debian/kolf-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kolf-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Miniature Golf"\
-	icon32x32="/usr/share/pixmaps/kolf.xpm"\
-	icon16x16="/usr/share/pixmaps/kolf-16.xpm"\
+	title="TDE Miniature Golf"\
+	icon32x32="/opt/trinity/share/pixmaps/kolf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kolf-16.xpm"\
 	command="/opt/trinity/games/kolf"
 
diff --git a/debian/wheezy/tdegames/debian/konquest-trinity.menu b/debian/wheezy/tdegames/debian/konquest-trinity.menu
index 6f1ba3d5b..f44bf7c5b 100644
--- a/debian/wheezy/tdegames/debian/konquest-trinity.menu
+++ b/debian/wheezy/tdegames/debian/konquest-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Strategy"\
 	hints="TDE"\
 	title="Konquest"\
-	icon32x32="/usr/share/pixmaps/konquest.xpm"\
-	icon16x16="/usr/share/pixmaps/konquest-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/konquest.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/konquest-16.xpm"\
 	command="/opt/trinity/games/konquest"
 
diff --git a/debian/wheezy/tdegames/debian/kpat-trinity.menu b/debian/wheezy/tdegames/debian/kpat-trinity.menu
index e5a38e07a..ab4bac664 100644
--- a/debian/wheezy/tdegames/debian/kpat-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kpat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Patience"\
-	icon32x32="/usr/share/pixmaps/kpat.xpm"\
-	icon16x16="/usr/share/pixmaps/kpat-16.xpm"\
+	title="TDE Patience"\
+	icon32x32="/opt/trinity/share/pixmaps/kpat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpat-16.xpm"\
 	command="/opt/trinity/games/kpat"
 
diff --git a/debian/wheezy/tdegames/debian/kpoker-trinity.menu b/debian/wheezy/tdegames/debian/kpoker-trinity.menu
index c2d4159ae..c47a27f13 100644
--- a/debian/wheezy/tdegames/debian/kpoker-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kpoker-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Poker"\
-	icon32x32="/usr/share/pixmaps/kpoker.xpm"\
-	icon16x16="/usr/share/pixmaps/kpoker-16.xpm"\
+	title="TDE Poker"\
+	icon32x32="/opt/trinity/share/pixmaps/kpoker.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kpoker-16.xpm"\
 	command="/opt/trinity/games/kpoker"
 
diff --git a/debian/wheezy/tdegames/debian/kreversi-trinity.menu b/debian/wheezy/tdegames/debian/kreversi-trinity.menu
index b70e74f45..1f5ae31ef 100644
--- a/debian/wheezy/tdegames/debian/kreversi-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kreversi-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Reversi"\
-	icon32x32="/usr/share/pixmaps/kreversi.xpm"\
-	icon16x16="/usr/share/pixmaps/kreversi-16.xpm"\
+	title="TDE Reversi"\
+	icon32x32="/opt/trinity/share/pixmaps/kreversi.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kreversi-16.xpm"\
 	command="/opt/trinity/games/kreversi"
 
diff --git a/debian/wheezy/tdegames/debian/ksame-trinity.menu b/debian/wheezy/tdegames/debian/ksame-trinity.menu
index 47dfe1141..fe5b27701 100644
--- a/debian/wheezy/tdegames/debian/ksame-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksame-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksame):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,SameGame"\
-	title="KDE SameGame"\
-	icon32x32="/usr/share/pixmaps/ksame.xpm"\
-	icon16x16="/usr/share/pixmaps/ksame-16.xpm"\
+	hints="TDE,SameGame"\
+	title="TDE SameGame"\
+	icon32x32="/opt/trinity/share/pixmaps/ksame.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksame-16.xpm"\
 	command="/opt/trinity/games/ksame"
 
diff --git a/debian/wheezy/tdegames/debian/kshisen-trinity.menu b/debian/wheezy/tdegames/debian/kshisen-trinity.menu
index a39078df3..9f7dea281 100644
--- a/debian/wheezy/tdegames/debian/kshisen-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kshisen-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Board"\
 	hints="TDE"\
-	title="KDE Shisen-Sho"\
-	icon32x32="/usr/share/pixmaps/kshisen.xpm"\
-	icon16x16="/usr/share/pixmaps/kshisen-16.xpm"\
+	title="TDE Shisen-Sho"\
+	icon32x32="/opt/trinity/share/pixmaps/kshisen.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kshisen-16.xpm"\
 	command="/opt/trinity/games/kshisen"
 
diff --git a/debian/wheezy/tdegames/debian/ksirtet-trinity.menu b/debian/wheezy/tdegames/debian/ksirtet-trinity.menu
index 24fd18497..3550e7243 100644
--- a/debian/wheezy/tdegames/debian/ksirtet-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksirtet-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Sirtet"\
-	icon32x32="/usr/share/pixmaps/ksirtet.xpm"\
-	icon16x16="/usr/share/pixmaps/ksirtet-16.xpm"\
+	title="TDE Sirtet"\
+	icon32x32="/opt/trinity/share/pixmaps/ksirtet.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksirtet-16.xpm"\
 	command="/opt/trinity/games/ksirtet"
 
diff --git a/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu b/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu
index bd7016ec5..854fbeaa7 100644
--- a/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksmiletris-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Tetris-like"\
 	hints="TDE"\
-	title="KDE Smiletris"\
-	icon32x32="/usr/share/pixmaps/ksmiletris.xpm"\
-	icon16x16="/usr/share/pixmaps/ksmiletris-16.xpm"\
+	title="TDE Smiletris"\
+	icon32x32="/opt/trinity/share/pixmaps/ksmiletris.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksmiletris-16.xpm"\
 	command="/opt/trinity/games/ksmiletris"
 
diff --git a/debian/wheezy/tdegames/debian/ksnake-trinity.menu b/debian/wheezy/tdegames/debian/ksnake-trinity.menu
index aff1ff762..f64835ed1 100644
--- a/debian/wheezy/tdegames/debian/ksnake-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksnake-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Snake Race"\
-	icon32x32="/usr/share/pixmaps/ksnake.xpm"\
-	icon16x16="/usr/share/pixmaps/ksnake-16.xpm"\
+	title="TDE Snake Race"\
+	icon32x32="/opt/trinity/share/pixmaps/ksnake.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksnake-16.xpm"\
 	command="/opt/trinity/games/ksnake"
 
diff --git a/debian/wheezy/tdegames/debian/ksokoban-trinity.menu b/debian/wheezy/tdegames/debian/ksokoban-trinity.menu
index 9477f6aad..b32d23fa0 100644
--- a/debian/wheezy/tdegames/debian/ksokoban-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ksokoban-trinity.menu
@@ -1,9 +1,9 @@
 ?package(ksokoban):\
 	needs="x11"\
 	section="Games/Puzzles"\
-	hints="KDE,Sokoban"\
-	title="KDE Sokoban"\
-	icon32x32="/usr/share/pixmaps/ksokoban.xpm"\
-	icon16x16="/usr/share/pixmaps/ksokoban-16.xpm"\
+	hints="TDE,Sokoban"\
+	title="TDE Sokoban"\
+	icon32x32="/opt/trinity/share/pixmaps/ksokoban.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ksokoban-16.xpm"\
 	command="/opt/trinity/games/ksokoban"
 
diff --git a/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu b/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu
index fc371d376..dcbb8be1f 100644
--- a/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kspaceduel-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE SpaceDuel"\
-	icon32x32="/usr/share/pixmaps/kspaceduel.xpm"\
-	icon16x16="/usr/share/pixmaps/kspaceduel-16.xpm"\
+	title="TDE SpaceDuel"\
+	icon32x32="/opt/trinity/share/pixmaps/kspaceduel.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kspaceduel-16.xpm"\
 	command="/opt/trinity/games/kspaceduel"
 
diff --git a/debian/wheezy/tdegames/debian/ktron-trinity.menu b/debian/wheezy/tdegames/debian/ktron-trinity.menu
index 5815cd46e..a79bac48e 100644
--- a/debian/wheezy/tdegames/debian/ktron-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ktron-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Arcade"\
 	hints="TDE"\
-	title="KDE Tron"\
-	icon32x32="/usr/share/pixmaps/ktron.xpm"\
-	icon16x16="/usr/share/pixmaps/ktron-16.xpm"\
+	title="TDE Tron"\
+	icon32x32="/opt/trinity/share/pixmaps/ktron.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktron-16.xpm"\
 	command="/opt/trinity/games/ktron"
 
diff --git a/debian/wheezy/tdegames/debian/ktuberling-trinity.menu b/debian/wheezy/tdegames/debian/ktuberling-trinity.menu
index dd349623a..9f6dcf55b 100644
--- a/debian/wheezy/tdegames/debian/ktuberling-trinity.menu
+++ b/debian/wheezy/tdegames/debian/ktuberling-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Toys"\
 	hints="TDE"\
-	title="KDE Potato Guy"\
-	icon32x32="/usr/share/pixmaps/ktuberling.xpm"\
-	icon16x16="/usr/share/pixmaps/ktuberling-16.xpm"\
+	title="TDE Potato Guy"\
+	icon32x32="/opt/trinity/share/pixmaps/ktuberling.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktuberling-16.xpm"\
 	command="/opt/trinity/games/ktuberling"
 
diff --git a/debian/wheezy/tdegames/debian/kwin4-trinity.menu b/debian/wheezy/tdegames/debian/kwin4-trinity.menu
index 4b754c211..01aaabaec 100644
--- a/debian/wheezy/tdegames/debian/kwin4-trinity.menu
+++ b/debian/wheezy/tdegames/debian/kwin4-trinity.menu
@@ -3,7 +3,7 @@
 	section="Games/Board"\
 	hints="TDE"\
 	title="KWin4"\
-	icon32x32="/usr/share/pixmaps/twin4.xpm"\
-	icon16x16="/usr/share/pixmaps/twin4-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/twin4.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/twin4-16.xpm"\
 	command="/opt/trinity/games/twin4"
 
diff --git a/debian/wheezy/tdegames/debian/lskat-trinity.menu b/debian/wheezy/tdegames/debian/lskat-trinity.menu
index a4d714d7e..f8b8fb58f 100644
--- a/debian/wheezy/tdegames/debian/lskat-trinity.menu
+++ b/debian/wheezy/tdegames/debian/lskat-trinity.menu
@@ -2,8 +2,8 @@
 	needs="x11"\
 	section="Games/Card"\
 	hints="TDE"\
-	title="KDE Lieutnant Skat"\
-	icon32x32="/usr/share/pixmaps/lskat.xpm"\
-	icon16x16="/usr/share/pixmaps/lskat-16.xpm"\
+	title="TDE Lieutnant Skat"\
+	icon32x32="/opt/trinity/share/pixmaps/lskat.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/lskat-16.xpm"\
 	command="/opt/trinity/games/lskat"
 
diff --git a/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu b/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
index ff4a21a01..f1bfa96a5 100644
--- a/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kdvi-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kdvi):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,DVI,Documents"\
+	hints="TDE,DVI,Documents"\
 	title="KDVI"\
 	icon32x32="/opt/trinity/share/pixmaps/kdvi.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kdvi-16.xpm"\
diff --git a/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu b/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
index b6398cbaf..cd27c5660 100644
--- a/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kghostview-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kghostview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Documents"\
+	hints="TDE,Documents"\
 	title="KGhostView"\
 	icon32x32="/opt/trinity/share/pixmaps/kghostview.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kghostview-16.xpm"\
diff --git a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
index 5e1179c29..3287726f7 100644
--- a/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kpovmodeler-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kpovmodeler):\
 	needs="X11"\
 	section="Applications/Graphics"\
-	hints="KDE,Modeler"\
+	hints="TDE,Modeler"\
 	title="KPovModeler"\
 	icon32x32="/opt/trinity/share/pixmaps/kpovmodeler.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kpovmodeler-16.xpm"\
diff --git a/debian/wheezy/tdegraphics/debian/kview-trinity.menu b/debian/wheezy/tdegraphics/debian/kview-trinity.menu
index b835f26fc..e40a31e43 100644
--- a/debian/wheezy/tdegraphics/debian/kview-trinity.menu
+++ b/debian/wheezy/tdegraphics/debian/kview-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kview):\
 	needs="X11"\
 	section="Applications/Viewers"\
-	hints="KDE,Images"\
+	hints="TDE,Images"\
 	title="KView"\
 	icon32x32="/opt/trinity/share/pixmaps/kview.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kview-16.xpm"\
diff --git a/debian/wheezy/tdenetwork/debian/kopete-trinity.menu b/debian/wheezy/tdenetwork/debian/kopete-trinity.menu
index 4f809de8d..b74f7ab77 100644
--- a/debian/wheezy/tdenetwork/debian/kopete-trinity.menu
+++ b/debian/wheezy/tdenetwork/debian/kopete-trinity.menu
@@ -1,7 +1,7 @@
 ?package(kopete):\
 	needs="X11"\
 	section="Apps/Net"\
-	hints="KDE,IM"\
+	hints="TDE,IM"\
 	title="Kopete"\
 	icon32x32="/opt/trinity/share/pixmaps/kopete.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/kopete-16.xpm"\
diff --git a/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu b/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu
index 7d0ac36b3..1ae203b55 100644
--- a/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu
+++ b/debian/wheezy/tdenetwork/debian/ksirc-trinity.menu
@@ -1,7 +1,7 @@
 ?package(ksirc):\
 	needs="X11"\
 	section="Apps/Net"\
-	hints="KDE,IRC"\
+	hints="TDE,IRC"\
 	title="KSirc"\
 	icon32x32="/opt/trinity/share/pixmaps/ksirc.xpm"\
 	icon16x16="/opt/trinity/share/pixmaps/ksirc-16.xpm"\
diff --git a/debian/wheezy/tdepim/debian/akregator-trinity.menu b/debian/wheezy/tdepim/debian/akregator-trinity.menu
index 21d583f1e..06cf54f0e 100644
--- a/debian/wheezy/tdepim/debian/akregator-trinity.menu
+++ b/debian/wheezy/tdepim/debian/akregator-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="aKregator"\
-	icon32x32="/usr/share/pixmaps/akregator.xpm"\
-	icon16x16="/usr/share/pixmaps/akregator-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/akregator.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/akregator-16.xpm"\
 	command="/opt/trinity/bin/akregator"
diff --git a/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu b/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
index 61b962fe4..02504802f 100644
--- a/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kaddressbook-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAddressbook"\
-	icon32x32="/usr/share/pixmaps/kaddressbook.xpm"\
-	icon16x16="/usr/share/pixmaps/kaddressbook-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kaddressbook.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kaddressbook-16.xpm"\
 	command="/opt/trinity/bin/kaddressbook"
diff --git a/debian/wheezy/tdepim/debian/kalarm-trinity.menu b/debian/wheezy/tdepim/debian/kalarm-trinity.menu
index 237e68f5a..a3c634694 100644
--- a/debian/wheezy/tdepim/debian/kalarm-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kalarm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KAlarm"\
-	icon32x32="/usr/share/pixmaps/kalarm.xpm"\
-	icon16x16="/usr/share/pixmaps/kalarm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kalarm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kalarm-16.xpm"\
 	command="/opt/trinity/bin/kalarm"
diff --git a/debian/wheezy/tdepim/debian/karm-trinity.menu b/debian/wheezy/tdepim/debian/karm-trinity.menu
index 3dd2ce7a1..ed4af43be 100644
--- a/debian/wheezy/tdepim/debian/karm-trinity.menu
+++ b/debian/wheezy/tdepim/debian/karm-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Project Management"\
 	hints="TDE"\
 	title="KArm"\
-	icon32x32="/usr/share/pixmaps/karm.xpm"\
-	icon16x16="/usr/share/pixmaps/karm-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/karm.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/karm-16.xpm"\
 	command="/opt/trinity/bin/karm"
diff --git a/debian/wheezy/tdepim/debian/kmail-trinity.menu b/debian/wheezy/tdepim/debian/kmail-trinity.menu
index 186aa91b5..f2c27bf83 100644
--- a/debian/wheezy/tdepim/debian/kmail-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kmail-trinity.menu
@@ -1,8 +1,8 @@
 ?package(kmail):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail"\
-	icon32x32="/usr/share/pixmaps/kmail.xpm"\
-	icon16x16="/usr/share/pixmaps/kmail-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kmail.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kmail-16.xpm"\
 	command="/opt/trinity/bin/kmail"
diff --git a/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu b/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
index 1fdaa32b6..6f7a24a9e 100644
--- a/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kmailcvt-trinity.menu
@@ -1,6 +1,6 @@
 ?package(kmailcvt):\
 	needs="X11"\
 	section="Applications/Data Management"\
-	hints="KDE,Mail"\
+	hints="TDE,Mail"\
 	title="KMail/KAB Import Tool"\
 	command="/opt/trinity/bin/kmailcvt"
diff --git a/debian/wheezy/tdepim/debian/knode-trinity.menu b/debian/wheezy/tdepim/debian/knode-trinity.menu
index 97a22d6ab..5c5fdbe46 100644
--- a/debian/wheezy/tdepim/debian/knode-trinity.menu
+++ b/debian/wheezy/tdepim/debian/knode-trinity.menu
@@ -1,8 +1,8 @@
 ?package(knode):\
 	needs="X11"\
 	section="Applications/Network/Communication"\
-	hints="KDE,News"\
+	hints="TDE,News"\
 	title="KNode"\
-	icon32x32="/usr/share/pixmaps/knode.xpm"\
-	icon16x16="/usr/share/pixmaps/knode-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knode.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knode-16.xpm"\
 	command="/opt/trinity/bin/knode"
diff --git a/debian/wheezy/tdepim/debian/knotes-trinity.menu b/debian/wheezy/tdepim/debian/knotes-trinity.menu
index 5f7950cec..6a16b329b 100644
--- a/debian/wheezy/tdepim/debian/knotes-trinity.menu
+++ b/debian/wheezy/tdepim/debian/knotes-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KNotes"\
-	icon32x32="/usr/share/pixmaps/knotes.xpm"\
-	icon16x16="/usr/share/pixmaps/knotes-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/knotes.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/knotes-16.xpm"\
 	command="/opt/trinity/bin/knotes"
diff --git a/debian/wheezy/tdepim/debian/kontact-trinity.menu b/debian/wheezy/tdepim/debian/kontact-trinity.menu
index 82f335a93..631ad2ff2 100644
--- a/debian/wheezy/tdepim/debian/kontact-trinity.menu
+++ b/debian/wheezy/tdepim/debian/kontact-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="Kontact"\
-	icon32x32="/usr/share/pixmaps/kontact.xpm"\
-	icon16x16="/usr/share/pixmaps/kontact-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kontact.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kontact-16.xpm"\
 	command="/opt/trinity/bin/kontact"
diff --git a/debian/wheezy/tdepim/debian/korganizer-trinity.menu b/debian/wheezy/tdepim/debian/korganizer-trinity.menu
index 949d187c4..954c13991 100644
--- a/debian/wheezy/tdepim/debian/korganizer-trinity.menu
+++ b/debian/wheezy/tdepim/debian/korganizer-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Data Management"\
 	hints="TDE"\
 	title="KOrganizer"\
-	icon32x32="/usr/share/pixmaps/korganizer.xpm"\
-	icon16x16="/usr/share/pixmaps/korganizer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korganizer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korganizer-16.xpm"\
 	command="/opt/trinity/bin/korganizer"
diff --git a/debian/wheezy/tdepim/debian/korn-trinity.menu b/debian/wheezy/tdepim/debian/korn-trinity.menu
index e12f773c6..7fbe02cee 100644
--- a/debian/wheezy/tdepim/debian/korn-trinity.menu
+++ b/debian/wheezy/tdepim/debian/korn-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Network/Web News"\
 	hints="TDE"\
 	title="KOrn"\
-	icon32x32="/usr/share/pixmaps/korn.xpm"\
-	icon16x16="/usr/share/pixmaps/korn-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/korn.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/korn-16.xpm"\
 	command="/opt/trinity/bin/korn"
diff --git a/debian/wheezy/tdepim/debian/ktnef-trinity.menu b/debian/wheezy/tdepim/debian/ktnef-trinity.menu
index 8a1cbda31..8b16ab8ae 100644
--- a/debian/wheezy/tdepim/debian/ktnef-trinity.menu
+++ b/debian/wheezy/tdepim/debian/ktnef-trinity.menu
@@ -3,6 +3,6 @@
 	section="Applications/Viewers"\
 	hints="TDE"\
 	title="KTnef"\
-	icon32x32="/usr/share/pixmaps/ktnef.xpm"\
-	icon16x16="/usr/share/pixmaps/ktnef-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktnef.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktnef-16.xpm"\
 	command="/opt/trinity/bin/ktnef"
diff --git a/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu b/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
index 8d8c937df..030d74014 100644
--- a/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
+++ b/debian/wheezy/tdepim/debian/tdepim-wizards-trinity.menu
@@ -16,7 +16,7 @@
 	needs="X11"\
 	section="Applications/Network/Communication"\
 	hints="TDE"\
-	title="KDE Groupware Wizard"\
+	title="TDE Groupware Wizard"\
 	command="/opt/trinity/bin/groupwarewizard"
 
 ?package(tdepim-wizards):\
diff --git a/debian/wheezy/tdesdk/debian/cervisia-trinity.menu b/debian/wheezy/tdesdk/debian/cervisia-trinity.menu
index e2cbd329c..d19784c16 100644
--- a/debian/wheezy/tdesdk/debian/cervisia-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/cervisia-trinity.menu
@@ -1,9 +1,9 @@
 ?package(cervisia):\
   needs="x11"\
   section="Applications/Programming"\
-  hints="KDE,Version control"\
+  hints="TDE,Version control"\
   title="Cervisia"\
   longtitle="Cervisia (CVS Frontend)"\
-  icon="/usr/share/pixmaps/cervisia.xpm"\
+  icon="/opt/trinity/share/pixmaps/cervisia.xpm"\
   command="/opt/trinity/bin/cervisia"
 
diff --git a/debian/wheezy/tdesdk/debian/kbabel-trinity.menu b/debian/wheezy/tdesdk/debian/kbabel-trinity.menu
index 62d116d5c..844de065d 100644
--- a/debian/wheezy/tdesdk/debian/kbabel-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kbabel-trinity.menu
@@ -1,27 +1,27 @@
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel"\
         longtitle="KBabel (Translation Tool)"\
-        icon="/usr/share/pixmaps/kbabel.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabel.xpm"\
         command="/opt/trinity/bin/kbabel"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Dictionary"\
         longtitle="KBabel Dictionary (Translation Tool Dictionary)"\
-        icon="/usr/share/pixmaps/kbabeldict.xpm"\
+        icon="/opt/trinity/share/pixmaps/kbabeldict.xpm"\
         command="/opt/trinity/bin/kbabeldict"
 
 ?package(kbabel):\
         needs="x11"\
         section="Applications/Text"\
-        hints="KDE,l10n"\
+        hints="TDE,l10n"\
         title="KBabel Catalog Manager"\
         longtitle="KBabel Catalog Manager (Translation Tool Catalog Manager)"\
-        icon="/usr/share/pixmaps/catalogmanager.xpm"\
+        icon="/opt/trinity/share/pixmaps/catalogmanager.xpm"\
         command="/opt/trinity/bin/catalogmanager"
 
diff --git a/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu b/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu
index d03ad5010..e804977e4 100644
--- a/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kbugbuster-trinity.menu
@@ -3,6 +3,6 @@
         section="Applications/Project Management"\
         hints="TDE"\
         title="KBugBuster"\
-        longtitle="KBugBuster (KDE Bug Management)"\
-        icon="/usr/share/pixmaps/kbugbuster.xpm"\
+        longtitle="KBugBuster (TDE Bug Management)"\
+        icon="/opt/trinity/share/pixmaps/kbugbuster.xpm"\
         command="/opt/trinity/bin/kbugbuster"
diff --git a/debian/wheezy/tdesdk/debian/kompare-trinity.menu b/debian/wheezy/tdesdk/debian/kompare-trinity.menu
index d8cee1e5f..72c04f5fe 100644
--- a/debian/wheezy/tdesdk/debian/kompare-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kompare-trinity.menu
@@ -4,6 +4,6 @@
         hints="TDE"\
         title="Kompare"\
         longtitle="Kompare (Diff/Patch Frontend)"\
-        icon="/usr/share/pixmaps/kompare.xpm"\
+        icon="/opt/trinity/share/pixmaps/kompare.xpm"\
         command="/opt/trinity/bin/kompare"
 
diff --git a/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu b/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu
index 6b0c16029..01628115e 100644
--- a/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/kuiviewer-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KUIViewer"\
   longtitle="KUIViewer (Qt Designer UI File Viewer)"\
-  icon="/usr/share/pixmaps/kuiviewer.xpm"\
+  icon="/opt/trinity/share/pixmaps/kuiviewer.xpm"\
   command="/opt/trinity/bin/kuiviewer"
 
diff --git a/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu b/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu
index c23fa742b..4c9261ebb 100644
--- a/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/tdecachegrind-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="KCachegrind"\
   longtitle="KCachegrind (Profiler Frontend)"\
-  icon="/usr/share/pixmaps/tdecachegrind.xpm"\
+  icon="/opt/trinity/share/pixmaps/tdecachegrind.xpm"\
   command="/opt/trinity/bin/tdecachegrind"
 
diff --git a/debian/wheezy/tdesdk/debian/umbrello-trinity.menu b/debian/wheezy/tdesdk/debian/umbrello-trinity.menu
index b31aa1af8..234f273e9 100644
--- a/debian/wheezy/tdesdk/debian/umbrello-trinity.menu
+++ b/debian/wheezy/tdesdk/debian/umbrello-trinity.menu
@@ -4,6 +4,6 @@
   hints="TDE"\
   title="Umbrello"\
   longtitle="Umbrello (UML Modeller)"\
-  icon="/usr/share/pixmaps/umbrello.xpm"\
+  icon="/opt/trinity/share/pixmaps/umbrello.xpm"\
   command="/opt/trinity/bin/umbrello"
 
diff --git a/debian/wheezy/tdeutils/debian/ark-trinity.menu b/debian/wheezy/tdeutils/debian/ark-trinity.menu
index 8b8cfe9ac..5f567aced 100644
--- a/debian/wheezy/tdeutils/debian/ark-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/ark-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Ark"\
-	icon32x32="/usr/share/pixmaps/ark.xpm"\
-	icon16x16="/usr/share/pixmaps/ark-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ark.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ark-16.xpm"\
 	command="/opt/trinity/bin/ark"
 
 # Icon 32x32 ark/cr32-app-ark.png ark.xpm
diff --git a/debian/wheezy/tdeutils/debian/kcalc-trinity.menu b/debian/wheezy/tdeutils/debian/kcalc-trinity.menu
index 146e4b1fb..c5b8eb908 100644
--- a/debian/wheezy/tdeutils/debian/kcalc-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kcalc-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcalc):\
 	needs="X11"\
 	section="Apps/Math"\
-	hints="KDE,Calculators"\
+	hints="TDE,Calculators"\
 	title="KCalc"\
-	icon32x32="/usr/share/pixmaps/kcalc.xpm"\
-	icon16x16="/usr/share/pixmaps/kcalc-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcalc.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcalc-16.xpm"\
 	command="/opt/trinity/bin/kcalc"
 
 # Icon 32x32 kcalc/cr32-app-kcalc.png kcalc.xpm
diff --git a/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu b/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu
index 59a49f72d..045b58017 100644
--- a/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kcharselect-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kcharselect):\
 	needs="X11"\
 	section="Apps/Tools"\
-	hints="KDE,Characters"\
+	hints="TDE,Characters"\
 	title="KCharSelect"\
-	icon32x32="/usr/share/pixmaps/kcharselect.xpm"\
-	icon16x16="/usr/share/pixmaps/kcharselect-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kcharselect.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kcharselect-16.xpm"\
 	command="/opt/trinity/bin/kcharselect"
 
 # Icon 32x32 kcharselect/cr48-app-kcharselect.png kcharselect.xpm
diff --git a/debian/wheezy/tdeutils/debian/kdf-trinity.menu b/debian/wheezy/tdeutils/debian/kdf-trinity.menu
index b8faa3bd4..62373d1df 100644
--- a/debian/wheezy/tdeutils/debian/kdf-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kdf-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KDiskFree"\
-	icon32x32="/usr/share/pixmaps/kdf.xpm"\
-	icon16x16="/usr/share/pixmaps/kdf-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kdf.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kdf-16.xpm"\
 	command="/opt/trinity/bin/kdf"
 
 ?package(kdf):\
@@ -12,8 +12,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="kwikdisk"\
-	icon32x32="/usr/share/pixmaps/kwikdisk.xpm"\
-	icon16x16="/usr/share/pixmaps/kwikdisk-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kwikdisk.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kwikdisk-16.xpm"\
 	command="/opt/trinity/bin/kwikdisk"
 
 # Icon 32x32 kdf/pics/cr32-app-kdf.png kdf.xpm
diff --git a/debian/wheezy/tdeutils/debian/kedit-trinity.menu b/debian/wheezy/tdeutils/debian/kedit-trinity.menu
index a22b486b0..28d62014d 100644
--- a/debian/wheezy/tdeutils/debian/kedit-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kedit-trinity.menu
@@ -1,10 +1,10 @@
 ?package(kedit):\
 	needs="X11"\
 	section="Apps/Editors"\
-	hints="KDE,Text"\
+	hints="TDE,Text"\
 	title="KEdit"\
-	icon32x32="/usr/share/pixmaps/kedit.xpm"\
-	icon16x16="/usr/share/pixmaps/kedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kedit-16.xpm"\
 	command="/opt/trinity/bin/kedit"
 
 # Icon 32x32 kedit/pixmaps/cr32-app-kedit.png kedit.xpm
diff --git a/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu b/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu
index 60c18c954..66612d5bb 100644
--- a/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kfloppy-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/System"\
 	hints="TDE"\
 	title="KFloppy"\
-	icon32x32="/usr/share/pixmaps/kfloppy.xpm"\
-	icon16x16="/usr/share/pixmaps/kfloppy-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kfloppy.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kfloppy-16.xpm"\
 	command="/opt/trinity/bin/kfloppy"
 
 # Icon 32x32 kfloppy/cr32-app-kfloppy.png kfloppy.xpm
diff --git a/debian/wheezy/tdeutils/debian/kgpg-trinity.menu b/debian/wheezy/tdeutils/debian/kgpg-trinity.menu
index eb33f37ea..630a11407 100644
--- a/debian/wheezy/tdeutils/debian/kgpg-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kgpg-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kgpg"\
-	icon32x32="/usr/share/pixmaps/kgpg.xpm"\
-	icon16x16="/usr/share/pixmaps/kgpg-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kgpg.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kgpg-16.xpm"\
 	command="/opt/trinity/bin/kgpg"
 
 # Icon 32x32 kgpg/cr32-app-kgpg.png kgpg.xpm
diff --git a/debian/wheezy/tdeutils/debian/khexedit-trinity.menu b/debian/wheezy/tdeutils/debian/khexedit-trinity.menu
index 68dc4dc04..a22c59831 100644
--- a/debian/wheezy/tdeutils/debian/khexedit-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/khexedit-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KHexEdit"\
-	icon32x32="/usr/share/pixmaps/khexedit.xpm"\
-	icon16x16="/usr/share/pixmaps/khexedit-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/khexedit.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/khexedit-16.xpm"\
 	command="/opt/trinity/bin/khexedit"
 
 # Icon 32x32 khexedit/cr32-app-khexedit.png khexedit.xpm
diff --git a/debian/wheezy/tdeutils/debian/kjots-trinity.menu b/debian/wheezy/tdeutils/debian/kjots-trinity.menu
index 7133b6e69..aa2e44bd3 100644
--- a/debian/wheezy/tdeutils/debian/kjots-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kjots-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KJots"\
-	icon32x32="/usr/share/pixmaps/kjots.xpm"\
-	icon16x16="/usr/share/pixmaps/kjots-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kjots.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kjots-16.xpm"\
 	command="/opt/trinity/bin/kjots"
 
 # Icon 32x32 kjots/icons/cr32-app-kjots.png kjots.xpm
diff --git a/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu b/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu
index ccf18b04c..fdfb1893f 100644
--- a/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/kregexpeditor-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Kregexpeditor"\
-	icon32x32="/usr/share/pixmaps/kregexpeditor.xpm"\
-	icon16x16="/usr/share/pixmaps/kregexpeditor-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/kregexpeditor.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/kregexpeditor-16.xpm"\
 	command="/opt/trinity/bin/kregexpeditor"
 
 # Icon 32x32 kregexpeditor/cr32-app-kregexpeditor.png kregexpeditor.xpm
diff --git a/debian/wheezy/tdeutils/debian/ktimer-trinity.menu b/debian/wheezy/tdeutils/debian/ktimer-trinity.menu
index bcae05384..e25f4cf9e 100644
--- a/debian/wheezy/tdeutils/debian/ktimer-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/ktimer-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="KTimer"\
-	icon32x32="/usr/share/pixmaps/ktimer.xpm"\
-	icon16x16="/usr/share/pixmaps/ktimer-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/ktimer.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/ktimer-16.xpm"\
 	command="/opt/trinity/bin/ktimer"
 
 # Icon 32x32 ktimer/cr32-app-ktimer.png ktimer.xpm
diff --git a/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu b/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu
index fe8fb9c8d..bd29663a0 100644
--- a/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu
+++ b/debian/wheezy/tdeutils/debian/superkaramba-trinity.menu
@@ -3,8 +3,8 @@
 	section="Apps/Tools"\
 	hints="TDE"\
 	title="Superkaramba"\
-	icon32x32="/usr/share/pixmaps/superkaramba.xpm"\
-	icon16x16="/usr/share/pixmaps/superkaramba-16.xpm"\
+	icon32x32="/opt/trinity/share/pixmaps/superkaramba.xpm"\
+	icon16x16="/opt/trinity/share/pixmaps/superkaramba-16.xpm"\
 	command="/opt/trinity/bin/superkaramba"
 
 # Icon 32x32 superkaramba/icons/cr32-app-superkaramba.png superkaramba.xpm
diff --git a/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu b/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu
index 3734293c3..dbf27f386 100644
--- a/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu
+++ b/debian/wheezy/tdevelop/debian/tdevelop-trinity.menu
@@ -1,8 +1,8 @@
 ?package(tdevelop):\
         needs="X11"\
         section="Applications/Programming"\
-        hints="KDE,Development"\
+        hints="TDE,Development"\
         title="KDevelop"\
         longtitle="KDevelop (Development Environment)"\
-        icon="/usr/share/pixmaps/tdevelop.xpm"\
+        icon="/opt/trinity/share/pixmaps/tdevelop.xpm"\
         command="/opt/trinity/bin/tdevelop"