--- contrib/3dicons/Apps
+++ contrib/3dicons/Apps
@@ -1,16 +1,17 @@
 #XFM
 Xterm:::xterm.xpm:exec xterm:
 Emacs:::emacs.xpm:exec emacs:exec emacs $*
+Vi:::editor.xpm:exec xterm -geometry 80x30 -sb -e vi:exec xterm -geometry 80x30 -sb -e vi $*
 Textedit:::edit.xpm:exec textedit:exec textedit $*
 Mail:::mail.xpm:exec xmailtool:
 Calculator:::calc.xpm:exec xcalc:
 Manual:::helpme.xpm:exec xman:
-Toolbox:~/.xfm:Toolbox:tools.xpm:LOAD:
-Graphics:~/.xfm:Graphics:pictures.xpm:LOAD:
+Toolbox:~/.desk/xfm:Toolbox:tools.xpm:LOAD:
+Graphics:~/.desk/xfm:Graphics:pictures.xpm:LOAD:
 Netscape:::netscape.xpm:exec netscape:
 News:::news.xpm:exec xrn:
 Printer:::printer.xpm:lpq:exec lpr $*
-Trash::.trash:recycle.xpm:OPEN:shift; mv -f -b -V numbered $* $HOME/.trash
+Trash::.desk/trash:recycle.xpm:OPEN:shift; mv -f -b -V numbered $* $HOME/.desk/trash
 Home::.:home.xpm:OPEN:
 A\::/dos:a:floppy.xpm:OPEN:
 C\::/dos:c:harddrive.xpm:OPEN: