diff --git a/netvm/apps.orig/fedora-xterm.desktop b/netvm/apps.orig/fedora-xterm.desktop
new file mode 100644
index 0000000..212cb5c
--- /dev/null
+++ b/netvm/apps.orig/fedora-xterm.desktop
@@ -0,0 +1,44 @@
+# $XTermId: xterm.desktop,v 1.10 2010/06/15 10:58:13 tom Exp $
+# -----------------------------------------------------------------------------
+# this file is part of xterm
+#
+# Copyright 2006-2007,2010 by Thomas E. Dickey
+# 
+#                         All Rights Reserved
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
+
+[Desktop Entry]
+Name=XTerm
+GenericName=Terminal
+Comment=standard terminal emulator for the X window system
+Exec=xterm
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Icon=gnome-xterm
+Categories=System;TerminalEmulator;
+X-Desktop-File-Install-Version=0.16
diff --git a/netvm/apps.orig/konsole.desktop b/netvm/apps.orig/konsole.desktop
deleted file mode 100644
index c72e835..0000000
--- a/netvm/apps.orig/konsole.desktop
+++ /dev/null
@@ -1,173 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=konsole
-Icon=utilities-terminal
-X-DocPath=konsole/index.html
-Terminal=false
-X-KDE-StartupNotify=true
-
-Name=Konsole
-Name[af]=Konsole
-Name[ar]=كونسول
-Name[as]=Konsole
-Name[be]=Konsole
-Name[be@latin]=Konsole
-Name[bg]=Konsole
-Name[bn]=কনসোল
-Name[bn_IN]=Konsole
-Name[br]=Konsole
-Name[ca]=Konsole
-Name[ca@valencia]=Konsole
-Name[cs]=Konsole
-Name[csb]=Kònsola
-Name[cy]=Konsole
-Name[da]=Konsole
-Name[de]=Konsole
-Name[el]=Κονσόλα
-Name[en_GB]=Konsole
-Name[eo]=Konsole
-Name[es]=Konsole
-Name[et]=Konsool
-Name[eu]=Kontsola
-Name[fi]=Konsole
-Name[fr]=Konsole
-Name[fy]=Konsole
-Name[ga]=Konsole
-Name[gl]=Konsole
-Name[gu]=કોન્સોલ
-Name[he]=Konsole
-Name[hi]=कंसोल
-Name[hne]=कंसोल
-Name[hr]=Konzola
-Name[hsb]=Konsola
-Name[hu]=Konsole
-Name[is]=Skjáhermir
-Name[it]=Konsole
-Name[ja]=Konsole
-Name[ka]=კონსოლი
-Name[kk]=Konsole
-Name[km]=កុងសូល
-Name[kn]=ಕನ್ಸೋಲ್
-Name[ko]=Konsole
-Name[ku]=Konsol
-Name[lt]=Konsole
-Name[lv]=Konsole
-Name[mai]=कंसोल
-Name[mk]=Конзола
-Name[ml]=കണ്‍സോള്‍
-Name[mr]=कंसोल
-Name[ms]=Konsole
-Name[nb]=Konsole
-Name[nds]=Konsole
-Name[ne]=कन्सोल
-Name[nl]=Konsole
-Name[nn]=Konsoll
-Name[oc]=Konsole
-Name[or]=କୋଲସୋଲ
-Name[pa]=ਕਨਸੋਲ
-Name[pl]=Konsola
-Name[pt]=Konsole
-Name[pt_BR]=Konsole
-Name[ro]=Konsolă
-Name[ru]=Konsole
-Name[se]=Konsolla
-Name[si]=Konsole
-Name[sk]=Konzola
-Name[sl]=Konzola
-Name[sr]=Конзола
-Name[sr@latin]=Konsole
-Name[sv]=Konsole
-Name[ta]=கான்சோல்
-Name[te]=కాన్సోల్
-Name[tg]=Консол
-Name[th]=คอนโซล K
-Name[tr]=Konsole
-Name[uk]=Konsole
-Name[uz]=Konsole
-Name[uz@cyrillic]=Konsole
-Name[vi]=Konsole
-Name[wa]=Konsole
-Name[xh]=Konsole
-Name[x-test]=xxKonsolexx
-Name[zh_CN]=Konsole
-Name[zh_TW]=Konsole
-
-GenericName=Terminal
-GenericName[af]=Terminaal
-GenericName[ar]=طرفيّة
-GenericName[as]=টাৰ্মিনেল
-GenericName[be@latin]=Terminał
-GenericName[bg]=Терминал
-GenericName[bn]=টার্মিনাল
-GenericName[bn_IN]=টার্মিন্যাল
-GenericName[ca]=Terminal
-GenericName[ca@valencia]=Terminal
-GenericName[cs]=Terminál
-GenericName[csb]=Terminal
-GenericName[da]=Terminal
-GenericName[de]=Terminal
-GenericName[el]=Τερματικό
-GenericName[en_GB]=Terminal
-GenericName[eo]=Terminalo
-GenericName[es]=Terminal
-GenericName[et]=Terminal
-GenericName[eu]=Terminala
-GenericName[fi]=Komentoikkuna
-GenericName[fr]=Terminal
-GenericName[fy]=Terminal
-GenericName[ga]=Teirminéal
-GenericName[gl]=Terminal
-GenericName[gu]=ટર્મિનલ
-GenericName[he]=מסוף
-GenericName[hi]=टर्मिनल
-GenericName[hne]=टर्मिनल
-GenericName[hr]=Terminal
-GenericName[hsb]=Terminal
-GenericName[hu]=Terminál
-GenericName[is]=Skjáhermir
-GenericName[it]=Terminale
-GenericName[ja]=ターミナル
-GenericName[kk]=Терминал
-GenericName[km]=ស្ថានីយ
-GenericName[kn]=ಆದೇಶತೆರೆ (ಟರ್ಮಿನಲ್)
-GenericName[ko]=터미널
-GenericName[ku]=Termînal
-GenericName[lt]=Terminalas
-GenericName[lv]=Terminālis
-GenericName[mai]=टर्मिनल
-GenericName[mk]=Терминал
-GenericName[ml]=ടെര്‍മിനല്‍
-GenericName[mr]=टर्मिनल
-GenericName[nb]=Terminal
-GenericName[nds]=Konsool
-GenericName[nl]=Terminal
-GenericName[nn]=Terminal
-GenericName[or]=ଟର୍ମିନାଲ
-GenericName[pa]=ਟਰਮੀਨਲ
-GenericName[pl]=Terminal
-GenericName[pt]=Terminal
-GenericName[pt_BR]=Terminal
-GenericName[ro]=Terminal
-GenericName[ru]=Терминал
-GenericName[se]=Terminal
-GenericName[si]=Terminal
-GenericName[sk]=Terminál
-GenericName[sl]=Terminal
-GenericName[sr]=Терминал
-GenericName[sr@latin]=Terminal
-GenericName[sv]=Terminal
-GenericName[ta]=முனையம்
-GenericName[te]=టెర్మినల్
-GenericName[tg]=Терминал
-GenericName[th]=เทอร์มินัล
-GenericName[tr]=Uçbirim
-GenericName[uk]=Термінал
-GenericName[uz]=Terminal
-GenericName[uz@cyrillic]=Терминал
-GenericName[wa]=Terminå
-GenericName[x-test]=xxTerminalxx
-GenericName[zh_CN]=终端
-GenericName[zh_TW]=終端機
-X-DBUS-StartupType=Unique
-X-KDE-AuthorizeAction=shell_access
-Categories=Qt;KDE;System;TerminalEmulator;
diff --git a/netvm/apps.templates/fedora-xterm.desktop b/netvm/apps.templates/fedora-xterm.desktop
new file mode 100644
index 0000000..88a9ee4
--- /dev/null
+++ b/netvm/apps.templates/fedora-xterm.desktop
@@ -0,0 +1,46 @@
+# $XTermId: xterm.desktop,v 1.10 2010/06/15 10:58:13 tom Exp $
+# -----------------------------------------------------------------------------
+# this file is part of xterm
+#
+# Copyright 2006-2007,2010 by Thomas E. Dickey
+# 
+#                         All Rights Reserved
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# 
+# Except as contained in this notice, the name(s) of the above copyright
+# holders shall not be used in advertising or otherwise to promote the
+# sale, use or other dealings in this Software without prior written
+# authorization.
+# -----------------------------------------------------------------------------
+
+[Desktop Entry]
+Name=%VMNAME%: XTerm
+GenericName=%VMNAME%: Terminal
+Comment=standard terminal emulator for the X window system
+Exec=qvm-run -q --tray -a --user=root %VMNAME% "xterm"
+Terminal=false
+Type=Application
+Encoding=UTF-8
+Icon=gnome-xterm
+Categories=System;TerminalEmulator;
+X-Desktop-File-Install-Version=0.16
+X-Qubes-VmName=%VMNAME%
+Icon=%VMDIR%/icon.png