From deb0f4032fb44a5fb55326f3af1507d9e73c7e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B0=D0=BC=D0=BE=D1=83=D0=BA=D0=B8=D0=BD=20=D0=90?= =?UTF-8?q?=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9?= Date: Wed, 9 Jun 2010 18:19:21 +0400 Subject: [PATCH] Moved templates --- desktop/system/.calculate_directory | 1 - setup.py | 22 +++++++++++------- {desktop => templates}/.calculate_directory | 0 .../desktop}/.calculate_directory | 0 .../desktop}/00-init/.calculate_directory | 0 .../00-init/00-migrate/.calculate/ini.env | 0 .../00-init/00-migrate/.calculate_directory | 0 .../00-init/00-migrate/.zzz-calculate.kde | 0 .../00-init/00-migrate/.zzz-calculate.xfce | 0 .../00-init/01-init/.calculate/ini.env | 0 .../00-init/01-init/.calculate_directory | 0 .../02-system-always/.calculate/ini.env | 0 .../02-system-always/.calculate_directory | 0 .../desktop}/20-kde/.calculate_directory | 0 .../20-kde/kde-4.3-4.4/.calculate/ini.env | 0 .../20-kde/kde-4.3-4.4/.calculate_directory | 0 .../.config/autostart/kres-migrator.desktop | 0 .../kde-4.3-4.4/.kde4/share/config/kdeglobals | 0 .../.kde4/share/config/kglobalshortcutsrc | 0 .../kde-4.3-4.4/.kde4/share/config/kwinrc | 0 .../kde-4.3-4.4/.kde4/share/config/kxkbrc | 0 .../kde-4.3-4.4/.kde4/share/config/oxygenrc | 0 .../share/config/plasma-desktop-appletsrc | 0 .../.local/share/applications/gcstar.desktop | 0 .../share/applications/graveman.desktop | 0 .../.local/share/applications/mimeapps.list | 0 .../20-kde/kde-4.3-4.4/Desktop/.directory | 0 .../20-kde/kde-4.3-4.4/Desktop/Disks.desktop | 0 .../20-kde/kde-4.3-4.4/Desktop/FTP.desktop | 0 .../kde-4.3-4.4/Desktop/Home-remote.desktop | 0 .../20-kde/kde-4.3-4.4/Desktop/Home.desktop | 0 .../20-kde/kde-4.3-4.4/Desktop/README.desktop | 0 .../Desktop/calculate-community.desktop | 0 .../Desktop/calculate-install.desktop | 0 .../Desktop/partitionmanager.desktop | 0 .../20-kde/kde-4.3-4.4/Desktop/trash.desktop | 0 .../20-kde/kde-4.3/.calculate/ini.env | 0 .../20-kde/kde-4.3/.calculate_directory | 0 .../kde-4.3/.config/autostart/kopete.desktop | 0 .../.config/autostart/kres-migrator.desktop | 0 .../20-kde/kde-4.3/.config/gcstar/GCstar.conf | 0 .../20-kde/kde-4.3/.config/qtcurve.gtk-icons | 0 .../kde-4.3/.config/smplayer/smplayer.ini | 0 .../desktop}/20-kde/kde-4.3/.directory | 0 .../desktop}/20-kde/kde-4.3/.gtkrc-2.0-kde4 | 0 .../kde-4.3/.kde4/env/gtk-qt-engine.rc.sh | 0 .../share/apps/konqueror/profiles/webbrowsing | 0 .../.kde4/share/apps/konsole/Shell.profile | 0 .../.kde4/share/apps/konsole/default.keytab | 0 .../share/apps/kopete/kopetechatwindow.rc | 0 .../share/apps/kopete/kopeteemailwindow.rc | 0 .../.kde4/share/apps/kwallet/kdewallet.kwl | Bin .../kde-4.3/.kde4/share/config/amarokrc | 0 .../.kde4/share/config/colors/Recent_Colors | 0 .../kde-4.3/.kde4/share/config/emaildefaults | 0 .../.kde4/share/config/emailidentities | 0 .../20-kde/kde-4.3/.kde4/share/config/gtkrc | 0 .../kde-4.3/.kde4/share/config/gtkrc-2.0 | 0 .../20-kde/kde-4.3/.kde4/share/config/katerc | 0 .../kde-4.3/.kde4/share/config/kclock.kssrc | 0 .../kde-4.3/.kde4/share/config/kcmdisplayrc | 0 .../kde-4.3/.kde4/share/config/kcminputrc | 0 .../kde-4.3/.kde4/share/config/kcookiejarrc | 0 .../kde-4.3/.kde4/share/config/kde.notifyrc | 0 .../kde-4.3/.kde4/share/config/kdeglobals | 0 .../.kde4/share/config/kglobalshortcutsrc | 0 .../kde-4.3/.kde4/share/config/kio_httprc | 0 .../20-kde/kde-4.3/.kde4/share/config/kmailrc | 0 .../kde-4.3/.kde4/share/config/konquerorrc | 0 .../kde-4.3/.kde4/share/config/konsolerc | 0 .../.kde4/share/config/kopete.notifyrc | 0 .../kde-4.3/.kde4/share/config/kopeterc | 0 .../kde-4.3/.kde4/share/config/kscreensaverrc | 0 .../kde-4.3/.kde4/share/config/ksmserverrc | 0 .../kde-4.3/.kde4/share/config/ksplashrc | 0 .../kde-4.3/.kde4/share/config/kwalletrc | 0 .../20-kde/kde-4.3/.kde4/share/config/kwinrc | 0 .../kde-4.3/.kde4/share/config/kwriterc | 0 .../20-kde/kde-4.3/.kde4/share/config/kxkbrc | 0 .../kde-4.3/.kde4/share/config/mailtransports | 0 .../.kde4/share/config/nepomukserverrc | 0 .../share/config/plasma-desktop-appletsrc | 0 .../.kde4/share/config/plasma-desktoprc | 0 .../kde-4.3/.kde4/share/config/plasmarc | 0 .../applications/bsh-console-bsh.desktop | 0 .../applications/calculate-community.desktop | 0 .../applications/calculate-install.desktop | 0 .../.local/share/applications/gcstar.desktop | 0 .../share/applications/goldendict.desktop | 0 .../.local/share/applications/mimeapps.list | 0 .../applications/partitionmanager.desktop | 0 .../.local/share/applications/xv-xv.desktop | 0 .../desktop}/20-kde/kde-4.3/.qt/qtrc | 0 .../20-kde/kde-4.4/.calculate/ini.env | 0 .../20-kde/kde-4.4/.calculate_directory | 0 .../kde-4.4/.config/autostart/kopete.desktop | 0 .../.config/autostart/kres-migrator.desktop | 0 .../20-kde/kde-4.4/.config/qtcurve.gtk-icons | 0 .../kde-4.4/.config/smplayer/smplayer.ini | 0 .../desktop}/20-kde/kde-4.4/.directory | 0 .../desktop}/20-kde/kde-4.4/.gtkrc-2.0-kde4 | 0 .../kde-4.4/.kde4/env/gtk-qt-engine.rc.sh | 0 .../share/apps/konqueror/profiles/webbrowsing | 0 .../.kde4/share/apps/konsole/Shell.profile | 0 .../.kde4/share/apps/konsole/default.keytab | 0 .../share/apps/kopete/kopetechatwindow.rc | 0 .../share/apps/kopete/kopeteemailwindow.rc | 0 .../.kde4/share/apps/kwallet/kdewallet.kwl | Bin .../kde-4.4/.kde4/share/config/amarokrc | 0 .../.kde4/share/config/colors/Recent_Colors | 0 .../kde-4.4/.kde4/share/config/emaildefaults | 0 .../.kde4/share/config/emailidentities | 0 .../20-kde/kde-4.4/.kde4/share/config/gtkrc | 0 .../kde-4.4/.kde4/share/config/gtkrc-2.0 | 0 .../20-kde/kde-4.4/.kde4/share/config/katerc | 0 .../kde-4.4/.kde4/share/config/kclock.kssrc | 0 .../kde-4.4/.kde4/share/config/kcmdisplayrc | 0 .../kde-4.4/.kde4/share/config/kcminputrc | 0 .../kde-4.4/.kde4/share/config/kcookiejarrc | 0 .../kde-4.4/.kde4/share/config/kde.notifyrc | 0 .../kde-4.4/.kde4/share/config/kdeglobals | 0 .../.kde4/share/config/kglobalshortcutsrc | 0 .../kde-4.4/.kde4/share/config/kio_httprc | 0 .../kde-4.4/.kde4/share/config/konquerorrc | 0 .../kde-4.4/.kde4/share/config/konsolerc | 0 .../.kde4/share/config/kopete.notifyrc | 0 .../kde-4.4/.kde4/share/config/kopeterc | 0 .../kde-4.4/.kde4/share/config/kscreensaverrc | 0 .../kde-4.4/.kde4/share/config/ksmserverrc | 0 .../kde-4.4/.kde4/share/config/ksplashrc | 0 .../kde-4.4/.kde4/share/config/kwalletrc | 0 .../20-kde/kde-4.4/.kde4/share/config/kwinrc | 0 .../kde-4.4/.kde4/share/config/kwriterc | 0 .../20-kde/kde-4.4/.kde4/share/config/kxkbrc | 0 .../kde-4.4/.kde4/share/config/mailtransports | 0 .../.kde4/share/config/nepomukserverrc | 0 .../kde-4.4/.kde4/share/config/oxygenrc | 0 .../share/config/plasma-desktop-appletsrc | 0 .../.kde4/share/config/plasma-desktoprc | 0 .../kde-4.4/.kde4/share/config/plasmarc | 0 .../applications/bsh-console-bsh.desktop | 0 .../applications/calculate-community.desktop | 0 .../applications/calculate-install.desktop | 0 .../share/applications/goldendict.desktop | 0 .../.local/share/applications/mimeapps.list | 0 .../applications/partitionmanager.desktop | 0 .../desktop}/20-kde/kde-4.4/.qt/qtrc | 0 .../20-kde/kde-4.4/Desktop/.directory | 0 .../20-kde/kde-4.4/Desktop/Disks.desktop | 0 .../20-kde/kde-4.4/Desktop/FTP.desktop | 0 .../kde-4.4/Desktop/Home-remote.desktop | 0 .../20-kde/kde-4.4/Desktop/Home.desktop | 0 .../20-kde/kde-4.4/Desktop/README.desktop | 0 .../Desktop/calculate-community.desktop | 0 .../kde-4.4/Desktop/calculate-install.desktop | 0 .../kde-4.4/Desktop/partitionmanager.desktop | 0 .../20-kde/kde-always/.calculate_directory | 0 .../share/config/plasma-desktop-appletsrc | 0 .../kde-always/Desktop/.calculate_directory | 0 .../20-kde/kde-always/Desktop/FTP.desktop | 0 .../kde-always/Desktop/FTP.desktop.remove | 0 .../20-kde/kmail-4.4/.calculate/ini.env | 0 .../20-kde/kmail-4.4/.calculate_directory | 0 .../kmail-4.4/.kde4/share/config/kmailrc | 0 .../desktop}/30-gnome/.calculate_directory | 0 .../30-gnome/evolution-2.6/.calculate/ini.env | 0 .../evolution-2.6/.calculate_directory | 0 .../mail/config/folder-tree-expand-state.xml | 0 .../.evolution/signatures/default | 0 .../30-gnome/evolution-2.6/.gconf/%gconf.xml | 0 .../evolution-2.6/.gconf/apps/%gconf.xml | 0 .../.gconf/apps/evolution/%gconf.xml | 0 .../.gconf/apps/evolution/mail/%gconf.xml | 0 .../apps/evolution/mail/display/%gconf.xml | 0 .../30-gnome/gnome-2.6/.calculate/ini.env | 0 .../30-gnome/gnome-2.6/.calculate_directory | 0 .../autostart/fusion-icon-autostart.desktop | 0 .../autostart/fusion-icon-remove.desktop | 0 .../.config/compiz/compizconfig/config | 0 .../gnome-2.6/.config/compiz/fusion-icon | 0 .../30-gnome/gnome-2.6/.gconf/%gconf.xml | 0 .../30-gnome/gnome-2.6/.gconf/apps/%gconf.xml | 0 .../gnome-2.6/.gconf/apps/gksu/%gconf.xml | 0 .../.gconf/apps/gksu/.calculate_directory | 0 .../gnome-2.6/.gconf/apps/glipper/%gconf.xml | 0 .../apps/gnome-power-manager/%gconf.xml | 0 .../gnome-power-manager/.calculate_directory | 0 .../gnome-power-manager/general/%gconf.xml | 0 .../.gconf/apps/gnome-terminal/%gconf.xml | 0 .../apps/gnome-terminal/global/%gconf.xml | 0 .../apps/gnome-terminal/profiles/%gconf.xml | 0 .../profiles/Default/%gconf.xml | 0 .../apps/gnome_settings_daemon/%gconf.xml | 0 .../keybindings/%gconf.xml | 0 .../gnome-2.6/.gconf/apps/metacity/%gconf.xml | 0 .../.gconf/apps/metacity/general/%gconf.xml | 0 .../metacity/global_keybindings/%gconf.xml | 0 .../gnome-2.6/.gconf/apps/nautilus/%gconf.xml | 0 .../.gconf/apps/nautilus/desktop/%gconf.xml | 0 .../apps/nautilus/preferences/%gconf.xml | 0 .../gnome-2.6/.gconf/apps/panel/%gconf.xml | 0 .../panel/100_top_objects_left/%gconf.xml | 0 .../100_top_objects_left/.calculate_directory | 0 .../100_mainmenu/%gconf.xml | 0 .../100_top_objects_left/101_home/%gconf.xml | 0 .../100_top_objects_left/102_disks/%gconf.xml | 0 .../102_disks/.calculate_directory | 0 .../100_top_objects_left/103_ftp/%gconf.xml | 0 .../103_ftp/.calculate_directory | 0 .../panel/101_top_applets_left/%gconf.xml | 0 .../101_top_applets_left/.calculate_directory | 0 .../104_workspaceswitcher/%gconf.xml | 0 .../104_workspaceswitcher/prefs/%gconf.xml | 0 .../105_windowlist/%gconf.xml | 0 .../105_windowlist/prefs/%gconf.xml | 0 .../panel/200_top_objects_right/%gconf.xml | 0 .../.calculate_directory | 0 .../200_logout/%gconf.xml | 0 .../200_logout/.calculate_directory | 0 .../201_shutdown/%gconf.xml | 0 .../201_shutdown/.calculate_directory | 0 .../200_top_objects_right/202_lock/%gconf.xml | 0 .../.calculate_directory | 0 .../203_clock/%gconf.xml | 0 .../203_clock/prefs/%gconf.xml | 0 .../204_mixer/%gconf.xml | 0 .../205_notification/%gconf.xml | 0 .../206_glipper/%gconf.xml | 0 .../207_keylayout/%gconf.xml | 0 .../208_trash/%gconf.xml | 0 .../apps/panel/300_bottom_objects/%gconf.xml | 0 .../300_bottom_objects/.calculate_directory | 0 .../300_webbrowser/%gconf.xml | 0 .../300_bottom_objects/301_mail/%gconf.xml | 0 .../300_bottom_objects/302_irc/%gconf.xml | 0 .../300_bottom_objects/303_jabber/%gconf.xml | 0 .../304_oowriter/%gconf.xml | 0 .../300_bottom_objects/305_oocalc/%gconf.xml | 0 .../306_calculator/%gconf.xml | 0 .../307_imageeditor/%gconf.xml | 0 .../308_imageviewer/%gconf.xml | 0 .../309_audioplayer/%gconf.xml | 0 .../310_videoplayer/%gconf.xml | 0 .../311_cdburner/%gconf.xml | 0 .../312_dictionary/%gconf.xml | 0 .../300_bottom_objects/313_editor/%gconf.xml | 0 .../314_terminal/%gconf.xml | 0 .../.gconf/apps/panel/general/%gconf.xml | 0 .../.gconf/apps/panel/toplevels/%gconf.xml | 0 .../toplevels/bottom_panel_screen0/%gconf.xml | 0 .../background/%gconf.xml | 0 .../toplevels/top_panel_screen0/%gconf.xml | 0 .../top_panel_screen0/background/%gconf.xml | 0 .../gnome-2.6/.gconf/desktop/%gconf.xml | 0 .../gnome-2.6/.gconf/desktop/gnome/%gconf.xml | 0 .../desktop/gnome/applications/%gconf.xml | 0 .../gnome/applications/browser/%gconf.xml | 0 .../gnome/applications/media/%gconf.xml | 0 .../desktop/gnome/background/%gconf.xml | 0 .../.gconf/desktop/gnome/interface/%gconf.xml | 0 .../desktop/gnome/keybindings/%gconf.xml | 0 .../custom_force_logout/%gconf.xml | 0 .../keybindings/custom_logout/%gconf.xml | 0 .../custom_logout/.calculate_directory | 0 .../gnome/keybindings/custom_xkill/%gconf.xml | 0 .../desktop/gnome/peripherals/%gconf.xml | 0 .../gnome/peripherals/keyboard/%gconf.xml | 0 .../gnome/peripherals/keyboard/kbd/%gconf.xml | 0 .../peripherals/keyboard/kbd/%gconf.xml.br | 0 .../peripherals/keyboard/kbd/%gconf.xml.de | 0 .../peripherals/keyboard/kbd/%gconf.xml.es | 0 .../peripherals/keyboard/kbd/%gconf.xml.fr | 0 .../peripherals/keyboard/kbd/%gconf.xml.it | 0 .../peripherals/keyboard/kbd/%gconf.xml.pl | 0 .../peripherals/keyboard/kbd/%gconf.xml.ru | 0 .../peripherals/keyboard/kbd/%gconf.xml.uk | 0 .../peripherals/keyboard/kbd/%gconf.xml.us | 0 .../gnome/peripherals/mouse/%gconf.xml | 0 .../.gconf/desktop/gnome/session/%gconf.xml | 0 .../desktop/gnome/url-handlers/%gconf.xml | 0 .../gnome/url-handlers/about/%gconf.xml | 0 .../gnome/url-handlers/chrome/%gconf.xml | 0 .../desktop/gnome/url-handlers/ftp/%gconf.xml | 0 .../gnome/url-handlers/http/%gconf.xml | 0 .../gnome/url-handlers/https/%gconf.xml | 0 .../gnome/url-handlers/unknown/%gconf.xml | 0 .../panel2.d/default/launchers/Disks.desktop | 0 .../panel2.d/default/launchers/FTP.desktop | 0 .../panel2.d/default/launchers/Home.desktop | 0 .../README.desktop?os_root_type==livecd | 0 .../applications/bsh-console-bsh.desktop | 0 .../applications/calculate-community.desktop | 0 .../applications/calculate-install.desktop | 0 .../.local/share/applications/gfloppy.desktop | 0 .../.local/share/applications/gnomecc.desktop | 0 .../.local/share/applications/gparted.desktop | 0 .../.local/share/applications/mimeapps.list | 0 .../desktop-directories/AudioVideo.directory | 0 .../Settings-System.directory | 0 .../desktop-directories/Settings.directory | 0 .../desktop-directories/Utility.directory | 0 .../file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml | 0 .../x-nautilus-desktop:%2F%2F%2F.xml | 0 .../30-gnome/gnome-2.6/Desktop/README.desktop | 0 .../Desktop/calculate-community.desktop | 0 .../Desktop/calculate-install.desktop | 0 .../gnome-2.6/Desktop/gparted.desktop | 0 .../gnome-always/.calculate_directory | 0 .../30-gnome/gnome-always/.gconf/%gconf.xml | 0 .../gnome-always/.gconf/apps/%gconf.xml | 0 .../gnome-always/.gconf/apps/panel/%gconf.xml | 0 .../panel/100_top_objects_left/%gconf.xml | 0 .../100_top_objects_left/.calculate_directory | 0 .../100_top_objects_left/103_ftp/%gconf.xml | 0 .../103_ftp/%gconf.xml.remove | 0 .../.gconf/apps/panel/general/%gconf.xml | 0 .../panel2.d/default/launchers/FTP.desktop | 0 .../default/launchers/FTP.desktop.remove | 0 .../file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml | 0 .../x-nautilus-desktop:%2F%2F%2F.xml | 0 .../desktop}/40-xfce/.calculate_directory | 0 .../40-xfce/claws-mail-3.7/.calculate/ini.env | 0 .../claws-mail-3.7/.calculate_directory | 0 .../claws-mail-3.7/.claws-mail/accountrc.tmpl | 0 .../claws-mail-3.7/.claws-mail/clawsrc | 0 .../40-xfce/claws-mail-3.7/.signature | 0 .../cldx-10.2-10.4/.calculate_directory | 0 .../cldx-10.2-10.4/.config/Thunar/volmanrc | 0 .../autostart/fusion-icon-autostart.desktop | 0 .../xfce4-clipman-plugin-autostart.desktop | 0 .../autostart/xfce4-tips-autostart.desktop | 0 .../.config/menus/xfce-applications.menu | 0 .../.config/xfce4/desktop/icons.screen0.rc | 0 .../.config/xfce4/panel/launcher-30.rc | 0 .../.config/xfce4/panel/launcher-31.rc | 0 .../.config/xfce4/panel/launcher-43.rc | 0 .../.config/xfce4/panel/panels.xml | 0 .../.config/xfce4/panel/xkb-plugin-8.rc | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../.local/share/applications/Thunar.desktop | 0 .../.local/share/applications/defaults.list | 0 .../share/applications/epdfview.desktop | 0 .../.local/share/applications/gparted.desktop | 0 .../xfce-keyboard-settings.desktop | 0 .../applications/xfce4-about-xfce.desktop | 0 .../share/applications/xfce4-help.desktop | 0 .../applications/xfce4-run-program.desktop | 0 .../applications/xfce4-taskmanager.desktop | 0 .../xscreensaver-properties.desktop | 0 .../xfce-accessories.directory | 0 .../xfce-multimedia.directory | 0 .../xfce-network.directory | 0 .../40-xfce/xfce-4.6/.calculate/ini.env | 0 .../40-xfce/xfce-4.6/.calculate_directory | 0 .../xfce-4.6/.config/Terminal/terminalrc | 0 .../40-xfce/xfce-4.6/.config/Thunar/thunarrc | 0 .../40-xfce/xfce-4.6/.config/Thunar/volmanrc | 0 .../xfce4-clipman-plugin-autostart.desktop | 0 .../autostart/xfce4-tips-autostart.desktop | 0 .../.config/menus/xfce-applications.menu | 0 .../xfce-4.6/.config/mousepad/mousepadrc | 0 .../.config/xfce4/desktop/icons.screen0.rc | 0 .../40-xfce/xfce-4.6/.config/xfce4/helpers.rc | 0 .../.config/xfce4/panel/actions-12.rc | 0 .../.config/xfce4/panel/battmon-13.rc | 0 .../.config/xfce4/panel/datetime-10.rc | 0 .../.config/xfce4/panel/launcher-20.rc | 0 .../.config/xfce4/panel/launcher-21.rc | 0 .../.config/xfce4/panel/launcher-22.rc | 0 .../.config/xfce4/panel/launcher-23.rc | 0 .../.config/xfce4/panel/launcher-30.rc | 0 .../.config/xfce4/panel/launcher-31.rc | 0 .../.config/xfce4/panel/launcher-32.rc | 0 .../.config/xfce4/panel/launcher-33.rc | 0 .../.config/xfce4/panel/launcher-34.rc | 0 .../.config/xfce4/panel/launcher-35.rc | 0 .../.config/xfce4/panel/launcher-36.rc | 0 .../.config/xfce4/panel/launcher-37.rc | 0 .../.config/xfce4/panel/launcher-38.rc | 0 .../.config/xfce4/panel/launcher-39.rc | 0 .../.config/xfce4/panel/launcher-40.rc | 0 .../.config/xfce4/panel/launcher-41.rc | 0 .../.config/xfce4/panel/launcher-42.rc | 0 .../.config/xfce4/panel/launcher-43.rc | 0 .../.config/xfce4/panel/launcher-44.rc | 0 .../xfce-4.6/.config/xfce4/panel/pager-3.rc | 0 .../xfce-4.6/.config/xfce4/panel/panels.xml | 0 .../.config/xfce4/panel/separator-50.rc | 0 .../.config/xfce4/panel/separator-51.rc | 0 .../.config/xfce4/panel/separator-52.rc | 0 .../xfce-4.6/.config/xfce4/panel/systray-6.rc | 0 .../.config/xfce4/panel/tasklist-5.rc | 0 .../.config/xfce4/panel/xfce4-menu-1.rc | 0 .../xfce4/panel/xfce4-mixer-plugin-9.rc | 0 .../.config/xfce4/panel/xkb-plugin-8.rc | 0 .../xfce-perchannel-xml/xfce4-desktop.xml | 0 .../xfce4-keyboard-shortcuts.xml | 0 .../xfce-perchannel-xml/xfce4-panel.xml | 0 .../xfce-perchannel-xml/xfce4-session.xml | 0 .../xfconf/xfce-perchannel-xml/xfprint.xml | 0 .../xfconf/xfce-perchannel-xml/xfwm4.xml | 0 .../xfconf/xfce-perchannel-xml/xsettings.xml | 0 .../40-xfce/xfce-4.6/.gqview/gqviewrc | 0 .../.local/share/applications/Thunar.desktop | 0 .../applications/audacious2-gtkui.desktop | 0 .../share/applications/audacious2.desktop | 0 .../.local/share/applications/defaults.list | 0 .../share/applications/epdfview.desktop | 0 .../.local/share/applications/gparted.desktop | 0 .../xfce-keyboard-settings.desktop | 0 .../applications/xfce4-about-xfce.desktop | 0 .../share/applications/xfce4-help.desktop | 0 .../applications/xfce4-run-program.desktop | 0 .../applications/xfce4-taskmanager.desktop | 0 .../xscreensaver-properties.desktop | 0 .../xfce-accessories.directory | 0 .../xfce-multimedia.directory | 0 .../xfce-network.directory | 0 .../40-xfce/xfce-4.6/Desktop/Disks.desktop | 0 .../40-xfce/xfce-4.6/Desktop/FTP.desktop | 0 .../40-xfce/xfce-4.6/Desktop/Home.desktop | 0 .../README.desktop?os_root_type==livecd | 0 .../Desktop/calculate-community.desktop | 0 .../Desktop/calculate-install.desktop | 0 .../40-xfce/xfce-4.6/Desktop/gparted.desktop | 0 .../40-xfce/xfce-always/.calculate_directory | 0 .../.config/xfce4/desktop/icons.screen0.rc | 0 .../.config/xfce4/panel/launcher-22.rc | 0 .../.config/xfce4/panel/panels.xml | 0 .../40-xfce/xfce-always/Desktop/FTP.desktop | 0 .../xfce-always/Desktop/FTP.desktop.remove | 0 .../60-application/.calculate_directory | 0 .../desktop}/60-application/bash-3.0/.bashrc | 0 .../bash-3.0/.calculate/ini.env | 0 .../bash-3.0/.calculate_directory | 0 .../chromium-5.0/.calculate/ini.env | 0 .../chromium-5.0/.calculate_directory | 0 .../1.0/Cached Theme.pak | Bin .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA | Bin .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA | Bin .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA | Bin .../i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA | Bin .../1.0/manifest.json | 0 .../.config/chromium/Default/Preferences | 0 .../chromium-5.0/.config/chromium/First Run | 0 .../compiz-0.8.4/.calculate/ini.env | 0 .../compiz-0.8.4/.calculate_directory | 0 .../autostart/fusion-icon-autostart.desktop | 0 .../autostart/fusion-icon-remove.desktop | 0 .../.config/compiz/compizconfig/config | 0 .../compiz-0.8.4/.config/compiz/fusion-icon | 0 .../compiz-0.8.4/.gconf/%gconf.xml | 0 .../compiz-0.8.4/.gconf/apps/%gconf.xml | 0 .../.gconf/apps/compiz/%gconf.xml | 0 .../.gconf/apps/compiz/general/%gconf.xml | 0 .../apps/compiz/general/allscreens/%gconf.xml | 0 .../general/allscreens/options/%gconf.xml | 0 .../.gconf/apps/compiz/plugins/%gconf.xml | 0 .../apps/compiz/plugins/animation/%gconf.xml | 0 .../plugins/animation/screen0/%gconf.xml | 0 .../animation/screen0/options/%gconf.xml | 0 .../apps/compiz/plugins/decoration/%gconf.xml | 0 .../plugins/decoration/allscreens/%gconf.xml | 0 .../decoration/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/move/%gconf.xml | 0 .../compiz/plugins/move/allscreens/%gconf.xml | 0 .../move/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/place/%gconf.xml | 0 .../compiz/plugins/place/screen0/%gconf.xml | 0 .../plugins/place/screen0/options/%gconf.xml | 0 .../apps/compiz/plugins/scale/%gconf.xml | 0 .../plugins/scale/allscreens/%gconf.xml | 0 .../scale/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/snap/%gconf.xml | 0 .../compiz/plugins/snap/screen0/%gconf.xml | 0 .../plugins/snap/screen0/options/%gconf.xml | 0 .../compiz/plugins/staticswitcher/%gconf.xml | 0 .../plugins/staticswitcher/screen0/%gconf.xml | 0 .../staticswitcher/screen0/options/%gconf.xml | 0 .../apps/compiz/plugins/vpswitch/%gconf.xml | 0 .../plugins/vpswitch/allscreens/%gconf.xml | 0 .../vpswitch/allscreens/options/%gconf.xml | 0 .../apps/compiz/plugins/wall/%gconf.xml | 0 .../compiz/plugins/wall/allscreens/%gconf.xml | 0 .../wall/allscreens/options/%gconf.xml | 0 .../compiz-always/.calculate_directory | 0 .../autostart/fusion-icon-autostart.desktop | 0 .../autostart/fusion-icon-remove.desktop | 0 .../.config/compiz/compizconfig/config | 0 .../compiz-always/.config/compiz/fusion-icon | 0 .../fbreader-0.1/.FBReader/ui.xml | 0 .../fbreader-0.1/.calculate/ini.env | 0 .../fbreader-0.1/.calculate_directory | 0 .../firefox-3.5/.calculate/ini.env | 0 .../firefox-3.5/.calculate_directory | 0 .../applications/mozilla-firefox-3.5.desktop | 0 .../mozilla-firefox-3.5.desktop.del | 0 .../applications/mozilla-firefox-3.6.desktop | 0 .../mozilla-firefox-3.6.desktop.del | 0 .../adblockplus/.calculate_directory | 0 .../adblockplus/patterns_eng.ini | 0 .../adblockplus/patterns_rus.ini | 0 .../firefox/calculate.default/mimeTypes.rdf | 0 .../firefox/calculate.default/prefs.js | 0 .../firefox-3.5/.mozilla/firefox/profiles.ini | 0 .../firefox-always/.calculate_directory | 0 .../applications/mozilla-firefox-3.5.desktop | 0 .../mozilla-firefox-3.5.desktop.del | 0 .../applications/mozilla-firefox-3.6.desktop | 0 .../mozilla-firefox-3.6.desktop.del | 0 .../firefox/calculate.default/mimeTypes.rdf | 0 .../gimp-2.6/.calculate/ini.env | 0 .../gimp-2.6/.calculate_directory | 0 .../.local/share/applications/gimp.desktop | 0 .../konversation-1.2/.calculate/ini.env | 0 .../konversation-1.2/.calculate_directory | 0 .../.kde4/share/config/konversation.notifyrc | 0 .../.kde4/share/config/konversationrc | 0 .../konversation-always/.calculate_directory | 0 .../.kde4/share/config/konversationrc | 0 .../60-application/mc-4.7/.calculate/ini.env | 0 .../mc-4.7/.calculate_directory | 0 .../desktop}/60-application/mc-4.7/.mc/ini | 0 .../openoffice-3.2/.calculate/ini.env | 0 .../openoffice-3.2/.calculate_directory | 0 .../data/org/openoffice/Office/Common.xcu | 0 .../pidgin-2.6/.calculate/ini.env | 0 .../pidgin-2.6/.calculate_directory | 0 .../60-application/pidgin-2.6/.purple/accels | 0 .../pidgin-2.6/.purple/accounts.xml | 0 .../pidgin-2.6/.purple/gtkrc-2.0 | 0 .../pidgin-2.6/.purple/prefs.xml | 0 .../stardict-3.0/.calculate/ini.env | 0 .../stardict-3.0/.calculate_directory | 0 .../share/applications/stardict.desktop | 0 .../stardict-3.0/.stardict/stardict.cfg | 0 .../transmission-1.8/.calculate/ini.env | 0 .../transmission-1.8/.calculate_directory | 0 .../.config/transmission/settings.json | 0 .../60-application/vim-7.0/.calculate/ini.env | 0 .../vim-7.0/.calculate_directory | 0 .../desktop}/60-application/vim-7.0/.vimrc | 0 .../xchat-2.8/.calculate/ini.env | 0 .../xchat-2.8/.calculate_directory | 0 .../xchat-2.8/.xchat2/xchat.conf | 0 .../xchat-always/.calculate_directory | 0 .../xchat-always/.xchat2/xchat.conf | 0 .../xscreensaver-5.10/.calculate/ini.env | 0 .../xscreensaver-5.10/.calculate_directory | 0 .../xscreensaver-5.10/.xscreensaver | 0 .../desktop}/80-patches/.calculate_directory | 0 .../patch-2.1.16/.calculate/ini.env | 0 .../patch-2.1.16/.calculate_directory | 0 .../.config/xfce4/.calculate_directory | 0 .../.config/xfce4/panel/launcher-32.rc | 0 .../patch-2.1.16/.kde4/.calculate_directory | 0 .../.kde4/share/config/konversationrc | 0 .../patch-2.1.16/.kde4/share/config/kwinrc | 0 .../patch-2.1.16/.kde4/share/config/kxkbrc | 0 .../applications/calculate-community.desktop | 0 .../.mozilla/firefox/.calculate_directory | 0 .../firefox/calculate.default/mimeTypes.rdf | 0 .../Desktop/calculate-community.desktop | 0 .../patch-2.1.17/.calculate/ini.env | 0 .../patch-2.1.17/.calculate_directory | 0 .../patch-2.1.17/.gconf/.calculate_directory | 0 .../gnome/peripherals/keyboard/%gconf.xml | 0 .../gnome/peripherals/keyboard/kbd/%gconf.xml | 0 .../peripherals/keyboard/kbd/%gconf.xml.br | 0 .../peripherals/keyboard/kbd/%gconf.xml.de | 0 .../peripherals/keyboard/kbd/%gconf.xml.es | 0 .../peripherals/keyboard/kbd/%gconf.xml.fr | 0 .../peripherals/keyboard/kbd/%gconf.xml.it | 0 .../peripherals/keyboard/kbd/%gconf.xml.pl | 0 .../peripherals/keyboard/kbd/%gconf.xml.ru | 0 .../peripherals/keyboard/kbd/%gconf.xml.uk | 0 .../peripherals/keyboard/kbd/%gconf.xml.us | 0 .../patch-2.1.18/.calculate/ini.env | 0 .../patch-2.1.18/.calculate_directory | 0 .../.config/xfce4/.calculate_directory | 0 .../patch-2.1.18/.config/xfce4/helpers.rc | 0 .../.config/xfce4/panel/launcher-30.rc | 0 .../patch-2.1.18/.gconf/.calculate_directory | 0 .../panel/objects/300_webbrowser/%gconf.xml | 0 .../gnome/applications/browser/%gconf.xml | 0 .../gnome/url-handlers/about/%gconf.xml | 0 .../gnome/url-handlers/chrome/%gconf.xml | 0 .../desktop/gnome/url-handlers/ftp/%gconf.xml | 0 .../gnome/url-handlers/http/%gconf.xml | 0 .../gnome/url-handlers/https/%gconf.xml | 0 .../gnome/url-handlers/unknown/%gconf.xml | 0 .../patch-2.1.18/.gnome2/.calculate_directory | 0 .../README.desktop?os_root_type==livecd | 0 .../patch-2.1.18/.kde4/.calculate_directory | 0 .../.kde4/share/config/kdeglobals | 0 .../share/config/plasma-desktop-appletsrc | 0 .../.local/share/applications/defaults.list | 0 .../.local/share/applications/mimeapps.list | 0 .../patch-2.1.18/Desktop/README.desktop | 0 .../desktop}/99-final/.calculate/ini.env | 0 .../desktop}/99-final/.calculate_directory | 0 .../install/.calculate_directory | 0 .../install/gdm/.calculate_directory | 0 .../gdm/PostLogin/.calculate_directory | 0 .../install/gdm/PostLogin/Default | 0 .../gdm/PostSession/.calculate_directory | 0 .../install/gdm/PostSession/00Default | 0 .../install/gdm/PostSession/05Default | 0 .../install/kdm/.calculate_directory | 0 .../system => templates}/install/kdm/kdmrc | 0 .../install/slim/.calculate_directory | 0 .../install/slim/slim.conf | 0 .../uninstall/.calculate_directory | 0 .../uninstall/gdm/.calculate_directory | 0 .../gdm/PostLogin/.calculate_directory | 0 .../uninstall/gdm/PostLogin/Default | 0 .../gdm/PostSession/.calculate_directory | 0 .../uninstall/gdm/PostSession/00Default | 0 .../uninstall/gdm/PostSession/05Default | 0 .../uninstall/kdm/.calculate_directory | 0 .../system => templates}/uninstall/kdm/kdmrc | 0 .../uninstall/slim/.calculate_directory | 0 .../uninstall/slim/slim.conf | 0 627 files changed, 14 insertions(+), 9 deletions(-) delete mode 100644 desktop/system/.calculate_directory rename {desktop => templates}/.calculate_directory (100%) rename {desktop/user => templates/desktop}/.calculate_directory (100%) rename {desktop/user => templates/desktop}/00-init/.calculate_directory (100%) rename {desktop/user => templates/desktop}/00-init/00-migrate/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/00-init/00-migrate/.calculate_directory (100%) rename {desktop/user => templates/desktop}/00-init/00-migrate/.zzz-calculate.kde (100%) rename {desktop/user => templates/desktop}/00-init/00-migrate/.zzz-calculate.xfce (100%) rename {desktop/user => templates/desktop}/00-init/01-init/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/00-init/01-init/.calculate_directory (100%) rename {desktop/user => templates/desktop}/00-init/02-system-always/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/00-init/02-system-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.config/autostart/kres-migrator.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.kde4/share/config/kdeglobals (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.kde4/share/config/kwinrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.kde4/share/config/kxkbrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.kde4/share/config/oxygenrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.local/share/applications/gcstar.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.local/share/applications/graveman.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/.local/share/applications/mimeapps.list (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/.directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/Disks.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/FTP.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/Home-remote.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/Home.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/README.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/partitionmanager.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3-4.4/Desktop/trash.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.config/autostart/kopete.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.config/autostart/kres-migrator.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.config/gcstar/GCstar.conf (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.config/qtcurve.gtk-icons (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.config/smplayer/smplayer.ini (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.gtkrc-2.0-kde4 (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/env/gtk-qt-engine.rc.sh (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/apps/konsole/Shell.profile (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/apps/konsole/default.keytab (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/apps/kopete/kopetechatwindow.rc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/apps/kopete/kopeteemailwindow.rc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/apps/kwallet/kdewallet.kwl (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/amarokrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/colors/Recent_Colors (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/emaildefaults (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/emailidentities (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/gtkrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/gtkrc-2.0 (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/katerc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kclock.kssrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kcmdisplayrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kcminputrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kcookiejarrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kde.notifyrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kdeglobals (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kglobalshortcutsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kio_httprc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kmailrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/konquerorrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/konsolerc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kopete.notifyrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kopeterc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kscreensaverrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/ksmserverrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/ksplashrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kwalletrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kwinrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kwriterc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/kxkbrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/mailtransports (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/nepomukserverrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/plasma-desktop-appletsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/plasma-desktoprc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.kde4/share/config/plasmarc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/bsh-console-bsh.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/gcstar.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/goldendict.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/mimeapps.list (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/partitionmanager.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.local/share/applications/xv-xv.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.3/.qt/qtrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.config/autostart/kopete.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.config/autostart/kres-migrator.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.config/qtcurve.gtk-icons (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.config/smplayer/smplayer.ini (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.gtkrc-2.0-kde4 (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/env/gtk-qt-engine.rc.sh (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/apps/konsole/Shell.profile (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/apps/konsole/default.keytab (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/apps/kopete/kopetechatwindow.rc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/apps/kopete/kopeteemailwindow.rc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/apps/kwallet/kdewallet.kwl (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/amarokrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/colors/Recent_Colors (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/emaildefaults (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/emailidentities (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/gtkrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/gtkrc-2.0 (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/katerc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kclock.kssrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kcmdisplayrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kcminputrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kcookiejarrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kde.notifyrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kdeglobals (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kglobalshortcutsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kio_httprc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/konquerorrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/konsolerc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kopete.notifyrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kopeterc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kscreensaverrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/ksmserverrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/ksplashrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kwalletrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kwinrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kwriterc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/kxkbrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/mailtransports (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/nepomukserverrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/oxygenrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/plasma-desktoprc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.kde4/share/config/plasmarc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.local/share/applications/bsh-console-bsh.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.local/share/applications/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.local/share/applications/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.local/share/applications/goldendict.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.local/share/applications/mimeapps.list (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.local/share/applications/partitionmanager.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/.qt/qtrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/.directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/Disks.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/FTP.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/Home-remote.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/Home.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/README.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-4.4/Desktop/partitionmanager.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-always/.kde4/share/config/plasma-desktop-appletsrc (100%) rename {desktop/user => templates/desktop}/20-kde/kde-always/Desktop/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kde-always/Desktop/FTP.desktop (100%) rename {desktop/user => templates/desktop}/20-kde/kde-always/Desktop/FTP.desktop.remove (100%) rename {desktop/user => templates/desktop}/20-kde/kmail-4.4/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/20-kde/kmail-4.4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/20-kde/kmail-4.4/.kde4/share/config/kmailrc (100%) rename {desktop/user => templates/desktop}/30-gnome/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.evolution/signatures/default (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.gconf/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.gconf/apps/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.gconf/apps/evolution/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.config/autostart/fusion-icon-autostart.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.config/autostart/fusion-icon-remove.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.config/compiz/compizconfig/config (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.config/compiz/fusion-icon (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gksu/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gksu/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/glipper/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/general/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/global/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/metacity/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/metacity/general/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/metacity/global_keybindings/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/nautilus/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/nautilus/preferences/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/100_mainmenu/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/101_home/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/prefs/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/prefs/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/202_lock/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/prefs/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/204_mixer/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/205_notification/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/206_glipper/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/207_keylayout/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/208_trash/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/301_mail/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/302_irc/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/303_jabber/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/304_oowriter/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/305_oocalc/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/306_calculator/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/307_imageeditor/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/308_imageviewer/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/309_audioplayer/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/310_videoplayer/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/311_cdburner/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/312_dictionary/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/313_editor/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/314_terminal/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/background/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/media/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/interface/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_force_logout/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_xkill/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/mouse/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/bsh-console-bsh.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/gfloppy.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/gnomecc.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/gparted.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/applications/mimeapps.list (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/desktop-directories/AudioVideo.directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings-System.directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings.directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.local/share/desktop-directories/Utility.directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/Desktop/README.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/Desktop/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/Desktop/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-2.6/Desktop/gparted.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/panel/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gconf/apps/panel/general/%gconf.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml (100%) rename {desktop/user => templates/desktop}/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/.calculate_directory (100%) rename {desktop/user => templates/desktop}/40-xfce/claws-mail-3.7/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/40-xfce/claws-mail-3.7/.calculate_directory (100%) rename {desktop/user => templates/desktop}/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl (100%) rename {desktop/user => templates/desktop}/40-xfce/claws-mail-3.7/.claws-mail/clawsrc (100%) rename {desktop/user => templates/desktop}/40-xfce/claws-mail-3.7/.signature (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/Thunar/volmanrc (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/autostart/fusion-icon-autostart.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-clipman-plugin-autostart.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-tips-autostart.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/menus/xfce-applications.menu (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/xkb-plugin-8.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/Thunar.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/defaults.list (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/epdfview.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/gparted.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce-keyboard-settings.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-about-xfce.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-help.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-run-program.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-taskmanager.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/applications/xscreensaver-properties.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-accessories.directory (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-multimedia.directory (100%) rename {desktop/user => templates/desktop}/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-network.directory (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.calculate_directory (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/Terminal/terminalrc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/Thunar/thunarrc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/Thunar/volmanrc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/autostart/xfce4-clipman-plugin-autostart.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/autostart/xfce4-tips-autostart.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/menus/xfce-applications.menu (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/mousepad/mousepadrc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/helpers.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/actions-12.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/battmon-13.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/datetime-10.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-20.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-21.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-22.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-23.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-30.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-31.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-32.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-33.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-34.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-35.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-36.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-37.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-38.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-39.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-40.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-41.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-42.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-43.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-44.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/pager-3.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/separator-50.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/separator-51.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/separator-52.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/systray-6.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/tasklist-5.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-menu-1.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-mixer-plugin-9.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/panel/xkb-plugin-8.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.gqview/gqviewrc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/Thunar.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/audacious2-gtkui.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/audacious2.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/defaults.list (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/epdfview.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/gparted.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/xfce-keyboard-settings.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/xfce4-about-xfce.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/xfce4-help.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/xfce4-run-program.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/xfce4-taskmanager.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/applications/xscreensaver-properties.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-multimedia.directory (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-network.directory (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/Disks.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/FTP.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/Home.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/README.desktop?os_root_type==livecd (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/calculate-install.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-4.6/Desktop/gparted.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-always/.config/xfce4/panel/launcher-22.rc (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-always/.config/xfce4/panel/panels.xml (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-always/Desktop/FTP.desktop (100%) rename {desktop/user => templates/desktop}/40-xfce/xfce-always/Desktop/FTP.desktop.remove (100%) rename {desktop/user => templates/desktop}/60-application/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/bash-3.0/.bashrc (100%) rename {desktop/user => templates/desktop}/60-application/bash-3.0/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/bash-3.0/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/Default/Preferences (100%) rename {desktop/user => templates/desktop}/60-application/chromium-5.0/.config/chromium/First Run (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.config/compiz/compizconfig/config (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.config/compiz/fusion-icon (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml (100%) rename {desktop/user => templates/desktop}/60-application/compiz-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/compiz-always/.config/autostart/fusion-icon-autostart.desktop (100%) rename {desktop/user => templates/desktop}/60-application/compiz-always/.config/autostart/fusion-icon-remove.desktop (100%) rename {desktop/user => templates/desktop}/60-application/compiz-always/.config/compiz/compizconfig/config (100%) rename {desktop/user => templates/desktop}/60-application/compiz-always/.config/compiz/fusion-icon (100%) rename {desktop/user => templates/desktop}/60-application/fbreader-0.1/.FBReader/ui.xml (100%) rename {desktop/user => templates/desktop}/60-application/fbreader-0.1/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/fbreader-0.1/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.mozilla/firefox/calculate.default/prefs.js (100%) rename {desktop/user => templates/desktop}/60-application/firefox-3.5/.mozilla/firefox/profiles.ini (100%) rename {desktop/user => templates/desktop}/60-application/firefox-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop (100%) rename {desktop/user => templates/desktop}/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del (100%) rename {desktop/user => templates/desktop}/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop (100%) rename {desktop/user => templates/desktop}/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del (100%) rename {desktop/user => templates/desktop}/60-application/firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf (100%) rename {desktop/user => templates/desktop}/60-application/gimp-2.6/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/gimp-2.6/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/gimp-2.6/.local/share/applications/gimp.desktop (100%) rename {desktop/user => templates/desktop}/60-application/konversation-1.2/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/konversation-1.2/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/konversation-1.2/.kde4/share/config/konversation.notifyrc (100%) rename {desktop/user => templates/desktop}/60-application/konversation-1.2/.kde4/share/config/konversationrc (100%) rename {desktop/user => templates/desktop}/60-application/konversation-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/konversation-always/.kde4/share/config/konversationrc (100%) rename {desktop/user => templates/desktop}/60-application/mc-4.7/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/mc-4.7/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/mc-4.7/.mc/ini (100%) rename {desktop/user => templates/desktop}/60-application/openoffice-3.2/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/openoffice-3.2/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu (100%) rename {desktop/user => templates/desktop}/60-application/pidgin-2.6/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/pidgin-2.6/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/pidgin-2.6/.purple/accels (100%) rename {desktop/user => templates/desktop}/60-application/pidgin-2.6/.purple/accounts.xml (100%) rename {desktop/user => templates/desktop}/60-application/pidgin-2.6/.purple/gtkrc-2.0 (100%) rename {desktop/user => templates/desktop}/60-application/pidgin-2.6/.purple/prefs.xml (100%) rename {desktop/user => templates/desktop}/60-application/stardict-3.0/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/stardict-3.0/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/stardict-3.0/.local/share/applications/stardict.desktop (100%) rename {desktop/user => templates/desktop}/60-application/stardict-3.0/.stardict/stardict.cfg (100%) rename {desktop/user => templates/desktop}/60-application/transmission-1.8/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/transmission-1.8/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/transmission-1.8/.config/transmission/settings.json (100%) rename {desktop/user => templates/desktop}/60-application/vim-7.0/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/vim-7.0/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/vim-7.0/.vimrc (100%) rename {desktop/user => templates/desktop}/60-application/xchat-2.8/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/xchat-2.8/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/xchat-2.8/.xchat2/xchat.conf (100%) rename {desktop/user => templates/desktop}/60-application/xchat-always/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/xchat-always/.xchat2/xchat.conf (100%) rename {desktop/user => templates/desktop}/60-application/xscreensaver-5.10/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/60-application/xscreensaver-5.10/.calculate_directory (100%) rename {desktop/user => templates/desktop}/60-application/xscreensaver-5.10/.xscreensaver (100%) rename {desktop/user => templates/desktop}/80-patches/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.config/xfce4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.config/xfce4/panel/launcher-32.rc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.kde4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.kde4/share/config/konversationrc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.kde4/share/config/kwinrc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.kde4/share/config/kxkbrc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.local/share/applications/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.mozilla/firefox/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.16/Desktop/calculate-community.desktop (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.config/xfce4/helpers.rc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gnome2/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.kde4/.calculate_directory (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.local/share/applications/defaults.list (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list (100%) rename {desktop/user => templates/desktop}/80-patches/patch-2.1.18/Desktop/README.desktop (100%) rename {desktop/user => templates/desktop}/99-final/.calculate/ini.env (100%) rename {desktop/user => templates/desktop}/99-final/.calculate_directory (100%) rename {desktop/system => templates}/install/.calculate_directory (100%) rename {desktop/system => templates}/install/gdm/.calculate_directory (100%) rename {desktop/system => templates}/install/gdm/PostLogin/.calculate_directory (100%) rename {desktop/system => templates}/install/gdm/PostLogin/Default (100%) rename {desktop/system => templates}/install/gdm/PostSession/.calculate_directory (100%) rename {desktop/system => templates}/install/gdm/PostSession/00Default (100%) rename {desktop/system => templates}/install/gdm/PostSession/05Default (100%) rename {desktop/system => templates}/install/kdm/.calculate_directory (100%) rename {desktop/system => templates}/install/kdm/kdmrc (100%) rename {desktop/system => templates}/install/slim/.calculate_directory (100%) rename {desktop/system => templates}/install/slim/slim.conf (100%) rename {desktop/system => templates}/uninstall/.calculate_directory (100%) rename {desktop/system => templates}/uninstall/gdm/.calculate_directory (100%) rename {desktop/system => templates}/uninstall/gdm/PostLogin/.calculate_directory (100%) rename {desktop/system => templates}/uninstall/gdm/PostLogin/Default (100%) rename {desktop/system => templates}/uninstall/gdm/PostSession/.calculate_directory (100%) rename {desktop/system => templates}/uninstall/gdm/PostSession/00Default (100%) rename {desktop/system => templates}/uninstall/gdm/PostSession/05Default (100%) rename {desktop/system => templates}/uninstall/kdm/.calculate_directory (100%) rename {desktop/system => templates}/uninstall/kdm/kdmrc (100%) rename {desktop/system => templates}/uninstall/slim/.calculate_directory (100%) rename {desktop/system => templates}/uninstall/slim/slim.conf (100%) diff --git a/desktop/system/.calculate_directory b/desktop/system/.calculate_directory deleted file mode 100644 index 285f21e..0000000 --- a/desktop/system/.calculate_directory +++ /dev/null @@ -1 +0,0 @@ -# Calculate append=skip cl_pass_action==install||cl_pass_action==uninstall diff --git a/setup.py b/setup.py index d6eb901..c82ef00 100755 --- a/setup.py +++ b/setup.py @@ -32,13 +32,14 @@ data_files = [] var_data_files = [] -data_dirs_template = ['desktop'] +data_dirs_template = ['templates'] data_dirs_share = ['i18n'] -share_calculate_dir = "/usr/share/calculate-2.2/" +share_calculate_dir = "/usr/share/calculate-2.2" template_calculate_dir = os.path.join(share_calculate_dir, "templates") +template_replace_dirname = "desktop" -def __scanDir(scanDir, prefix, dirData, flagDir=False): +def __scanDir(scanDir, prefix, replace_dirname, dirData, flagDir=False): """Scan directory""" files = [] dirs = [] @@ -50,24 +51,29 @@ def __scanDir(scanDir, prefix, dirData, flagDir=False): files.append(absPath) elif stat.S_ISDIR(statInfo): dirs.append(absPath) + if replace_dirname: + listDirs = list(scanDir.partition("/"))[1:] + listDirs.insert(0,replace_dirname) + scanDir = "".join(listDirs) if prefix: scanDir = os.path.join(prefix,scanDir) dirData.append((scanDir, files)) for sDir in dirs: - __scanDir(sDir, prefix, dirData, True) + __scanDir(sDir, prefix, replace_dirname, dirData, True) return dirData -def create_data_files(data_dirs, prefix=""): +def create_data_files(data_dirs, prefix="", replace_dirname=""): """Create data_files""" data_files = [] for data_dir in data_dirs: data = [] - data_files += __scanDir(data_dir, prefix, data) + data_files += __scanDir(data_dir, prefix, replace_dirname, data) return data_files -data_files += create_data_files (data_dirs_template, template_calculate_dir) -data_files += create_data_files (data_dirs_share, share_calculate_dir) +data_files += create_data_files(data_dirs_template, template_calculate_dir, + template_replace_dirname) +data_files += create_data_files(data_dirs_share, share_calculate_dir) data_files += [('/usr/share/calculate-2.2/xdm', ['data/cmd_login', 'data/functions', 'data/gtkbg', diff --git a/desktop/.calculate_directory b/templates/.calculate_directory similarity index 100% rename from desktop/.calculate_directory rename to templates/.calculate_directory diff --git a/desktop/user/.calculate_directory b/templates/desktop/.calculate_directory similarity index 100% rename from desktop/user/.calculate_directory rename to templates/desktop/.calculate_directory diff --git a/desktop/user/00-init/.calculate_directory b/templates/desktop/00-init/.calculate_directory similarity index 100% rename from desktop/user/00-init/.calculate_directory rename to templates/desktop/00-init/.calculate_directory diff --git a/desktop/user/00-init/00-migrate/.calculate/ini.env b/templates/desktop/00-init/00-migrate/.calculate/ini.env similarity index 100% rename from desktop/user/00-init/00-migrate/.calculate/ini.env rename to templates/desktop/00-init/00-migrate/.calculate/ini.env diff --git a/desktop/user/00-init/00-migrate/.calculate_directory b/templates/desktop/00-init/00-migrate/.calculate_directory similarity index 100% rename from desktop/user/00-init/00-migrate/.calculate_directory rename to templates/desktop/00-init/00-migrate/.calculate_directory diff --git a/desktop/user/00-init/00-migrate/.zzz-calculate.kde b/templates/desktop/00-init/00-migrate/.zzz-calculate.kde similarity index 100% rename from desktop/user/00-init/00-migrate/.zzz-calculate.kde rename to templates/desktop/00-init/00-migrate/.zzz-calculate.kde diff --git a/desktop/user/00-init/00-migrate/.zzz-calculate.xfce b/templates/desktop/00-init/00-migrate/.zzz-calculate.xfce similarity index 100% rename from desktop/user/00-init/00-migrate/.zzz-calculate.xfce rename to templates/desktop/00-init/00-migrate/.zzz-calculate.xfce diff --git a/desktop/user/00-init/01-init/.calculate/ini.env b/templates/desktop/00-init/01-init/.calculate/ini.env similarity index 100% rename from desktop/user/00-init/01-init/.calculate/ini.env rename to templates/desktop/00-init/01-init/.calculate/ini.env diff --git a/desktop/user/00-init/01-init/.calculate_directory b/templates/desktop/00-init/01-init/.calculate_directory similarity index 100% rename from desktop/user/00-init/01-init/.calculate_directory rename to templates/desktop/00-init/01-init/.calculate_directory diff --git a/desktop/user/00-init/02-system-always/.calculate/ini.env b/templates/desktop/00-init/02-system-always/.calculate/ini.env similarity index 100% rename from desktop/user/00-init/02-system-always/.calculate/ini.env rename to templates/desktop/00-init/02-system-always/.calculate/ini.env diff --git a/desktop/user/00-init/02-system-always/.calculate_directory b/templates/desktop/00-init/02-system-always/.calculate_directory similarity index 100% rename from desktop/user/00-init/02-system-always/.calculate_directory rename to templates/desktop/00-init/02-system-always/.calculate_directory diff --git a/desktop/user/20-kde/.calculate_directory b/templates/desktop/20-kde/.calculate_directory similarity index 100% rename from desktop/user/20-kde/.calculate_directory rename to templates/desktop/20-kde/.calculate_directory diff --git a/desktop/user/20-kde/kde-4.3-4.4/.calculate/ini.env b/templates/desktop/20-kde/kde-4.3-4.4/.calculate/ini.env similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.calculate/ini.env rename to templates/desktop/20-kde/kde-4.3-4.4/.calculate/ini.env diff --git a/desktop/user/20-kde/kde-4.3-4.4/.calculate_directory b/templates/desktop/20-kde/kde-4.3-4.4/.calculate_directory similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.calculate_directory rename to templates/desktop/20-kde/kde-4.3-4.4/.calculate_directory diff --git a/desktop/user/20-kde/kde-4.3-4.4/.config/autostart/kres-migrator.desktop b/templates/desktop/20-kde/kde-4.3-4.4/.config/autostart/kres-migrator.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.config/autostart/kres-migrator.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/.config/autostart/kres-migrator.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kdeglobals b/templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kdeglobals similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kdeglobals rename to templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kdeglobals diff --git a/desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc b/templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc rename to templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kglobalshortcutsrc diff --git a/desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kwinrc b/templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kwinrc similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kwinrc rename to templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kwinrc diff --git a/desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kxkbrc b/templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kxkbrc similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/kxkbrc rename to templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/kxkbrc diff --git a/desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/oxygenrc b/templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/oxygenrc similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/oxygenrc rename to templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/oxygenrc diff --git a/desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc b/templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc rename to templates/desktop/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc diff --git a/desktop/user/20-kde/kde-4.3-4.4/.local/share/applications/gcstar.desktop b/templates/desktop/20-kde/kde-4.3-4.4/.local/share/applications/gcstar.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.local/share/applications/gcstar.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/.local/share/applications/gcstar.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/.local/share/applications/graveman.desktop b/templates/desktop/20-kde/kde-4.3-4.4/.local/share/applications/graveman.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.local/share/applications/graveman.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/.local/share/applications/graveman.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/.local/share/applications/mimeapps.list b/templates/desktop/20-kde/kde-4.3-4.4/.local/share/applications/mimeapps.list similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/.local/share/applications/mimeapps.list rename to templates/desktop/20-kde/kde-4.3-4.4/.local/share/applications/mimeapps.list diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/.directory b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/.directory similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/.directory rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/.directory diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/Disks.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/Disks.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/Disks.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/Disks.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/FTP.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/FTP.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/FTP.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/FTP.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/Home-remote.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/Home-remote.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/Home-remote.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/Home-remote.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/Home.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/Home.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/Home.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/Home.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/README.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/README.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/README.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/README.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/calculate-community.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/calculate-community.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/calculate-community.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/calculate-community.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/calculate-install.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/calculate-install.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/calculate-install.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/calculate-install.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/partitionmanager.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/partitionmanager.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/partitionmanager.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/partitionmanager.desktop diff --git a/desktop/user/20-kde/kde-4.3-4.4/Desktop/trash.desktop b/templates/desktop/20-kde/kde-4.3-4.4/Desktop/trash.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3-4.4/Desktop/trash.desktop rename to templates/desktop/20-kde/kde-4.3-4.4/Desktop/trash.desktop diff --git a/desktop/user/20-kde/kde-4.3/.calculate/ini.env b/templates/desktop/20-kde/kde-4.3/.calculate/ini.env similarity index 100% rename from desktop/user/20-kde/kde-4.3/.calculate/ini.env rename to templates/desktop/20-kde/kde-4.3/.calculate/ini.env diff --git a/desktop/user/20-kde/kde-4.3/.calculate_directory b/templates/desktop/20-kde/kde-4.3/.calculate_directory similarity index 100% rename from desktop/user/20-kde/kde-4.3/.calculate_directory rename to templates/desktop/20-kde/kde-4.3/.calculate_directory diff --git a/desktop/user/20-kde/kde-4.3/.config/autostart/kopete.desktop b/templates/desktop/20-kde/kde-4.3/.config/autostart/kopete.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.config/autostart/kopete.desktop rename to templates/desktop/20-kde/kde-4.3/.config/autostart/kopete.desktop diff --git a/desktop/user/20-kde/kde-4.3/.config/autostart/kres-migrator.desktop b/templates/desktop/20-kde/kde-4.3/.config/autostart/kres-migrator.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.config/autostart/kres-migrator.desktop rename to templates/desktop/20-kde/kde-4.3/.config/autostart/kres-migrator.desktop diff --git a/desktop/user/20-kde/kde-4.3/.config/gcstar/GCstar.conf b/templates/desktop/20-kde/kde-4.3/.config/gcstar/GCstar.conf similarity index 100% rename from desktop/user/20-kde/kde-4.3/.config/gcstar/GCstar.conf rename to templates/desktop/20-kde/kde-4.3/.config/gcstar/GCstar.conf diff --git a/desktop/user/20-kde/kde-4.3/.config/qtcurve.gtk-icons b/templates/desktop/20-kde/kde-4.3/.config/qtcurve.gtk-icons similarity index 100% rename from desktop/user/20-kde/kde-4.3/.config/qtcurve.gtk-icons rename to templates/desktop/20-kde/kde-4.3/.config/qtcurve.gtk-icons diff --git a/desktop/user/20-kde/kde-4.3/.config/smplayer/smplayer.ini b/templates/desktop/20-kde/kde-4.3/.config/smplayer/smplayer.ini similarity index 100% rename from desktop/user/20-kde/kde-4.3/.config/smplayer/smplayer.ini rename to templates/desktop/20-kde/kde-4.3/.config/smplayer/smplayer.ini diff --git a/desktop/user/20-kde/kde-4.3/.directory b/templates/desktop/20-kde/kde-4.3/.directory similarity index 100% rename from desktop/user/20-kde/kde-4.3/.directory rename to templates/desktop/20-kde/kde-4.3/.directory diff --git a/desktop/user/20-kde/kde-4.3/.gtkrc-2.0-kde4 b/templates/desktop/20-kde/kde-4.3/.gtkrc-2.0-kde4 similarity index 100% rename from desktop/user/20-kde/kde-4.3/.gtkrc-2.0-kde4 rename to templates/desktop/20-kde/kde-4.3/.gtkrc-2.0-kde4 diff --git a/desktop/user/20-kde/kde-4.3/.kde4/env/gtk-qt-engine.rc.sh b/templates/desktop/20-kde/kde-4.3/.kde4/env/gtk-qt-engine.rc.sh similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/env/gtk-qt-engine.rc.sh rename to templates/desktop/20-kde/kde-4.3/.kde4/env/gtk-qt-engine.rc.sh diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing b/templates/desktop/20-kde/kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing rename to templates/desktop/20-kde/kde-4.3/.kde4/share/apps/konqueror/profiles/webbrowsing diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/apps/konsole/Shell.profile b/templates/desktop/20-kde/kde-4.3/.kde4/share/apps/konsole/Shell.profile similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/apps/konsole/Shell.profile rename to templates/desktop/20-kde/kde-4.3/.kde4/share/apps/konsole/Shell.profile diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/apps/konsole/default.keytab b/templates/desktop/20-kde/kde-4.3/.kde4/share/apps/konsole/default.keytab similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/apps/konsole/default.keytab rename to templates/desktop/20-kde/kde-4.3/.kde4/share/apps/konsole/default.keytab diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/apps/kopete/kopetechatwindow.rc b/templates/desktop/20-kde/kde-4.3/.kde4/share/apps/kopete/kopetechatwindow.rc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/apps/kopete/kopetechatwindow.rc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/apps/kopete/kopetechatwindow.rc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/apps/kopete/kopeteemailwindow.rc b/templates/desktop/20-kde/kde-4.3/.kde4/share/apps/kopete/kopeteemailwindow.rc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/apps/kopete/kopeteemailwindow.rc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/apps/kopete/kopeteemailwindow.rc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/apps/kwallet/kdewallet.kwl b/templates/desktop/20-kde/kde-4.3/.kde4/share/apps/kwallet/kdewallet.kwl similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/apps/kwallet/kdewallet.kwl rename to templates/desktop/20-kde/kde-4.3/.kde4/share/apps/kwallet/kdewallet.kwl diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/amarokrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/amarokrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/amarokrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/amarokrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/colors/Recent_Colors b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/colors/Recent_Colors similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/colors/Recent_Colors rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/colors/Recent_Colors diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/emaildefaults b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/emaildefaults similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/emaildefaults rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/emaildefaults diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/emailidentities b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/emailidentities similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/emailidentities rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/emailidentities diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/gtkrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/gtkrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/gtkrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/gtkrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/gtkrc-2.0 b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/gtkrc-2.0 similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/gtkrc-2.0 rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/gtkrc-2.0 diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/katerc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/katerc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/katerc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/katerc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kclock.kssrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kclock.kssrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kclock.kssrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kclock.kssrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kcmdisplayrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kcmdisplayrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kcmdisplayrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kcmdisplayrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kcminputrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kcminputrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kcminputrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kcminputrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kcookiejarrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kcookiejarrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kcookiejarrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kcookiejarrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kde.notifyrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kde.notifyrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kde.notifyrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kde.notifyrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kdeglobals b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kdeglobals similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kdeglobals rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kdeglobals diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kglobalshortcutsrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kglobalshortcutsrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kglobalshortcutsrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kglobalshortcutsrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kio_httprc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kio_httprc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kio_httprc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kio_httprc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kmailrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kmailrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kmailrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kmailrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/konquerorrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/konquerorrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/konquerorrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/konquerorrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/konsolerc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/konsolerc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/konsolerc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/konsolerc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kopete.notifyrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kopete.notifyrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kopete.notifyrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kopete.notifyrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kopeterc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kopeterc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kopeterc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kopeterc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kscreensaverrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kscreensaverrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kscreensaverrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kscreensaverrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/ksmserverrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/ksmserverrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/ksmserverrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/ksmserverrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/ksplashrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/ksplashrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/ksplashrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/ksplashrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kwalletrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kwalletrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kwalletrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kwalletrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kwinrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kwinrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kwinrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kwinrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kwriterc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kwriterc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kwriterc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kwriterc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/kxkbrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/kxkbrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/kxkbrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/kxkbrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/mailtransports b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/mailtransports similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/mailtransports rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/mailtransports diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/nepomukserverrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/nepomukserverrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/nepomukserverrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/nepomukserverrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/plasma-desktop-appletsrc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/plasma-desktop-appletsrc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/plasma-desktop-appletsrc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/plasma-desktoprc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/plasma-desktoprc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/plasma-desktoprc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/plasma-desktoprc diff --git a/desktop/user/20-kde/kde-4.3/.kde4/share/config/plasmarc b/templates/desktop/20-kde/kde-4.3/.kde4/share/config/plasmarc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.kde4/share/config/plasmarc rename to templates/desktop/20-kde/kde-4.3/.kde4/share/config/plasmarc diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/bsh-console-bsh.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/bsh-console-bsh.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/bsh-console-bsh.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/bsh-console-bsh.desktop diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/calculate-community.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/calculate-community.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/calculate-community.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/calculate-community.desktop diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/calculate-install.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/calculate-install.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/calculate-install.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/calculate-install.desktop diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/gcstar.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/gcstar.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/gcstar.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/gcstar.desktop diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/goldendict.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/goldendict.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/goldendict.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/goldendict.desktop diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/mimeapps.list b/templates/desktop/20-kde/kde-4.3/.local/share/applications/mimeapps.list similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/mimeapps.list rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/mimeapps.list diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/partitionmanager.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/partitionmanager.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/partitionmanager.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/partitionmanager.desktop diff --git a/desktop/user/20-kde/kde-4.3/.local/share/applications/xv-xv.desktop b/templates/desktop/20-kde/kde-4.3/.local/share/applications/xv-xv.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.3/.local/share/applications/xv-xv.desktop rename to templates/desktop/20-kde/kde-4.3/.local/share/applications/xv-xv.desktop diff --git a/desktop/user/20-kde/kde-4.3/.qt/qtrc b/templates/desktop/20-kde/kde-4.3/.qt/qtrc similarity index 100% rename from desktop/user/20-kde/kde-4.3/.qt/qtrc rename to templates/desktop/20-kde/kde-4.3/.qt/qtrc diff --git a/desktop/user/20-kde/kde-4.4/.calculate/ini.env b/templates/desktop/20-kde/kde-4.4/.calculate/ini.env similarity index 100% rename from desktop/user/20-kde/kde-4.4/.calculate/ini.env rename to templates/desktop/20-kde/kde-4.4/.calculate/ini.env diff --git a/desktop/user/20-kde/kde-4.4/.calculate_directory b/templates/desktop/20-kde/kde-4.4/.calculate_directory similarity index 100% rename from desktop/user/20-kde/kde-4.4/.calculate_directory rename to templates/desktop/20-kde/kde-4.4/.calculate_directory diff --git a/desktop/user/20-kde/kde-4.4/.config/autostart/kopete.desktop b/templates/desktop/20-kde/kde-4.4/.config/autostart/kopete.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.config/autostart/kopete.desktop rename to templates/desktop/20-kde/kde-4.4/.config/autostart/kopete.desktop diff --git a/desktop/user/20-kde/kde-4.4/.config/autostart/kres-migrator.desktop b/templates/desktop/20-kde/kde-4.4/.config/autostart/kres-migrator.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.config/autostart/kres-migrator.desktop rename to templates/desktop/20-kde/kde-4.4/.config/autostart/kres-migrator.desktop diff --git a/desktop/user/20-kde/kde-4.4/.config/qtcurve.gtk-icons b/templates/desktop/20-kde/kde-4.4/.config/qtcurve.gtk-icons similarity index 100% rename from desktop/user/20-kde/kde-4.4/.config/qtcurve.gtk-icons rename to templates/desktop/20-kde/kde-4.4/.config/qtcurve.gtk-icons diff --git a/desktop/user/20-kde/kde-4.4/.config/smplayer/smplayer.ini b/templates/desktop/20-kde/kde-4.4/.config/smplayer/smplayer.ini similarity index 100% rename from desktop/user/20-kde/kde-4.4/.config/smplayer/smplayer.ini rename to templates/desktop/20-kde/kde-4.4/.config/smplayer/smplayer.ini diff --git a/desktop/user/20-kde/kde-4.4/.directory b/templates/desktop/20-kde/kde-4.4/.directory similarity index 100% rename from desktop/user/20-kde/kde-4.4/.directory rename to templates/desktop/20-kde/kde-4.4/.directory diff --git a/desktop/user/20-kde/kde-4.4/.gtkrc-2.0-kde4 b/templates/desktop/20-kde/kde-4.4/.gtkrc-2.0-kde4 similarity index 100% rename from desktop/user/20-kde/kde-4.4/.gtkrc-2.0-kde4 rename to templates/desktop/20-kde/kde-4.4/.gtkrc-2.0-kde4 diff --git a/desktop/user/20-kde/kde-4.4/.kde4/env/gtk-qt-engine.rc.sh b/templates/desktop/20-kde/kde-4.4/.kde4/env/gtk-qt-engine.rc.sh similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/env/gtk-qt-engine.rc.sh rename to templates/desktop/20-kde/kde-4.4/.kde4/env/gtk-qt-engine.rc.sh diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing b/templates/desktop/20-kde/kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing rename to templates/desktop/20-kde/kde-4.4/.kde4/share/apps/konqueror/profiles/webbrowsing diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/apps/konsole/Shell.profile b/templates/desktop/20-kde/kde-4.4/.kde4/share/apps/konsole/Shell.profile similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/apps/konsole/Shell.profile rename to templates/desktop/20-kde/kde-4.4/.kde4/share/apps/konsole/Shell.profile diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/apps/konsole/default.keytab b/templates/desktop/20-kde/kde-4.4/.kde4/share/apps/konsole/default.keytab similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/apps/konsole/default.keytab rename to templates/desktop/20-kde/kde-4.4/.kde4/share/apps/konsole/default.keytab diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/apps/kopete/kopetechatwindow.rc b/templates/desktop/20-kde/kde-4.4/.kde4/share/apps/kopete/kopetechatwindow.rc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/apps/kopete/kopetechatwindow.rc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/apps/kopete/kopetechatwindow.rc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/apps/kopete/kopeteemailwindow.rc b/templates/desktop/20-kde/kde-4.4/.kde4/share/apps/kopete/kopeteemailwindow.rc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/apps/kopete/kopeteemailwindow.rc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/apps/kopete/kopeteemailwindow.rc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/apps/kwallet/kdewallet.kwl b/templates/desktop/20-kde/kde-4.4/.kde4/share/apps/kwallet/kdewallet.kwl similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/apps/kwallet/kdewallet.kwl rename to templates/desktop/20-kde/kde-4.4/.kde4/share/apps/kwallet/kdewallet.kwl diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/amarokrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/amarokrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/amarokrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/amarokrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/colors/Recent_Colors b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/colors/Recent_Colors similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/colors/Recent_Colors rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/colors/Recent_Colors diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/emaildefaults b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/emaildefaults similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/emaildefaults rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/emaildefaults diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/emailidentities b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/emailidentities similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/emailidentities rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/emailidentities diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/gtkrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/gtkrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/gtkrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/gtkrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/gtkrc-2.0 b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/gtkrc-2.0 similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/gtkrc-2.0 rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/gtkrc-2.0 diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/katerc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/katerc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/katerc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/katerc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kclock.kssrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kclock.kssrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kclock.kssrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kclock.kssrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kcmdisplayrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kcmdisplayrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kcmdisplayrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kcmdisplayrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kcminputrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kcminputrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kcminputrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kcminputrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kcookiejarrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kcookiejarrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kcookiejarrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kcookiejarrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kde.notifyrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kde.notifyrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kde.notifyrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kde.notifyrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kdeglobals b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kdeglobals similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kdeglobals rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kdeglobals diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kglobalshortcutsrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kglobalshortcutsrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kglobalshortcutsrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kglobalshortcutsrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kio_httprc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kio_httprc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kio_httprc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kio_httprc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/konquerorrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/konquerorrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/konquerorrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/konquerorrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/konsolerc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/konsolerc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/konsolerc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/konsolerc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kopete.notifyrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kopete.notifyrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kopete.notifyrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kopete.notifyrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kopeterc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kopeterc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kscreensaverrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kscreensaverrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kscreensaverrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kscreensaverrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/ksmserverrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/ksmserverrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/ksmserverrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/ksmserverrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/ksplashrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/ksplashrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/ksplashrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/ksplashrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kwalletrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kwalletrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kwalletrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kwalletrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kwinrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kwinrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kwinrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kwinrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kwriterc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kwriterc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kwriterc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kwriterc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/kxkbrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/kxkbrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/kxkbrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/kxkbrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/mailtransports b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/mailtransports similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/mailtransports rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/mailtransports diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/nepomukserverrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/nepomukserverrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/nepomukserverrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/nepomukserverrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/oxygenrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/oxygenrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/oxygenrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/oxygenrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/plasma-desktop-appletsrc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktoprc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/plasma-desktoprc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/plasma-desktoprc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/plasma-desktoprc diff --git a/desktop/user/20-kde/kde-4.4/.kde4/share/config/plasmarc b/templates/desktop/20-kde/kde-4.4/.kde4/share/config/plasmarc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.kde4/share/config/plasmarc rename to templates/desktop/20-kde/kde-4.4/.kde4/share/config/plasmarc diff --git a/desktop/user/20-kde/kde-4.4/.local/share/applications/bsh-console-bsh.desktop b/templates/desktop/20-kde/kde-4.4/.local/share/applications/bsh-console-bsh.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.local/share/applications/bsh-console-bsh.desktop rename to templates/desktop/20-kde/kde-4.4/.local/share/applications/bsh-console-bsh.desktop diff --git a/desktop/user/20-kde/kde-4.4/.local/share/applications/calculate-community.desktop b/templates/desktop/20-kde/kde-4.4/.local/share/applications/calculate-community.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.local/share/applications/calculate-community.desktop rename to templates/desktop/20-kde/kde-4.4/.local/share/applications/calculate-community.desktop diff --git a/desktop/user/20-kde/kde-4.4/.local/share/applications/calculate-install.desktop b/templates/desktop/20-kde/kde-4.4/.local/share/applications/calculate-install.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.local/share/applications/calculate-install.desktop rename to templates/desktop/20-kde/kde-4.4/.local/share/applications/calculate-install.desktop diff --git a/desktop/user/20-kde/kde-4.4/.local/share/applications/goldendict.desktop b/templates/desktop/20-kde/kde-4.4/.local/share/applications/goldendict.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.local/share/applications/goldendict.desktop rename to templates/desktop/20-kde/kde-4.4/.local/share/applications/goldendict.desktop diff --git a/desktop/user/20-kde/kde-4.4/.local/share/applications/mimeapps.list b/templates/desktop/20-kde/kde-4.4/.local/share/applications/mimeapps.list similarity index 100% rename from desktop/user/20-kde/kde-4.4/.local/share/applications/mimeapps.list rename to templates/desktop/20-kde/kde-4.4/.local/share/applications/mimeapps.list diff --git a/desktop/user/20-kde/kde-4.4/.local/share/applications/partitionmanager.desktop b/templates/desktop/20-kde/kde-4.4/.local/share/applications/partitionmanager.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/.local/share/applications/partitionmanager.desktop rename to templates/desktop/20-kde/kde-4.4/.local/share/applications/partitionmanager.desktop diff --git a/desktop/user/20-kde/kde-4.4/.qt/qtrc b/templates/desktop/20-kde/kde-4.4/.qt/qtrc similarity index 100% rename from desktop/user/20-kde/kde-4.4/.qt/qtrc rename to templates/desktop/20-kde/kde-4.4/.qt/qtrc diff --git a/desktop/user/20-kde/kde-4.4/Desktop/.directory b/templates/desktop/20-kde/kde-4.4/Desktop/.directory similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/.directory rename to templates/desktop/20-kde/kde-4.4/Desktop/.directory diff --git a/desktop/user/20-kde/kde-4.4/Desktop/Disks.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/Disks.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/Disks.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/Disks.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/FTP.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/FTP.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/FTP.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/FTP.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/Home-remote.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/Home-remote.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/Home-remote.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/Home-remote.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/Home.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/Home.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/Home.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/Home.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/README.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/README.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/README.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/README.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/calculate-community.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/calculate-community.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/calculate-community.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/calculate-community.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/calculate-install.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/calculate-install.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/calculate-install.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/calculate-install.desktop diff --git a/desktop/user/20-kde/kde-4.4/Desktop/partitionmanager.desktop b/templates/desktop/20-kde/kde-4.4/Desktop/partitionmanager.desktop similarity index 100% rename from desktop/user/20-kde/kde-4.4/Desktop/partitionmanager.desktop rename to templates/desktop/20-kde/kde-4.4/Desktop/partitionmanager.desktop diff --git a/desktop/user/20-kde/kde-always/.calculate_directory b/templates/desktop/20-kde/kde-always/.calculate_directory similarity index 100% rename from desktop/user/20-kde/kde-always/.calculate_directory rename to templates/desktop/20-kde/kde-always/.calculate_directory diff --git a/desktop/user/20-kde/kde-always/.kde4/share/config/plasma-desktop-appletsrc b/templates/desktop/20-kde/kde-always/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from desktop/user/20-kde/kde-always/.kde4/share/config/plasma-desktop-appletsrc rename to templates/desktop/20-kde/kde-always/.kde4/share/config/plasma-desktop-appletsrc diff --git a/desktop/user/20-kde/kde-always/Desktop/.calculate_directory b/templates/desktop/20-kde/kde-always/Desktop/.calculate_directory similarity index 100% rename from desktop/user/20-kde/kde-always/Desktop/.calculate_directory rename to templates/desktop/20-kde/kde-always/Desktop/.calculate_directory diff --git a/desktop/user/20-kde/kde-always/Desktop/FTP.desktop b/templates/desktop/20-kde/kde-always/Desktop/FTP.desktop similarity index 100% rename from desktop/user/20-kde/kde-always/Desktop/FTP.desktop rename to templates/desktop/20-kde/kde-always/Desktop/FTP.desktop diff --git a/desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove b/templates/desktop/20-kde/kde-always/Desktop/FTP.desktop.remove similarity index 100% rename from desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove rename to templates/desktop/20-kde/kde-always/Desktop/FTP.desktop.remove diff --git a/desktop/user/20-kde/kmail-4.4/.calculate/ini.env b/templates/desktop/20-kde/kmail-4.4/.calculate/ini.env similarity index 100% rename from desktop/user/20-kde/kmail-4.4/.calculate/ini.env rename to templates/desktop/20-kde/kmail-4.4/.calculate/ini.env diff --git a/desktop/user/20-kde/kmail-4.4/.calculate_directory b/templates/desktop/20-kde/kmail-4.4/.calculate_directory similarity index 100% rename from desktop/user/20-kde/kmail-4.4/.calculate_directory rename to templates/desktop/20-kde/kmail-4.4/.calculate_directory diff --git a/desktop/user/20-kde/kmail-4.4/.kde4/share/config/kmailrc b/templates/desktop/20-kde/kmail-4.4/.kde4/share/config/kmailrc similarity index 100% rename from desktop/user/20-kde/kmail-4.4/.kde4/share/config/kmailrc rename to templates/desktop/20-kde/kmail-4.4/.kde4/share/config/kmailrc diff --git a/desktop/user/30-gnome/.calculate_directory b/templates/desktop/30-gnome/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/.calculate_directory rename to templates/desktop/30-gnome/.calculate_directory diff --git a/desktop/user/30-gnome/evolution-2.6/.calculate/ini.env b/templates/desktop/30-gnome/evolution-2.6/.calculate/ini.env similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.calculate/ini.env rename to templates/desktop/30-gnome/evolution-2.6/.calculate/ini.env diff --git a/desktop/user/30-gnome/evolution-2.6/.calculate_directory b/templates/desktop/30-gnome/evolution-2.6/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.calculate_directory rename to templates/desktop/30-gnome/evolution-2.6/.calculate_directory diff --git a/desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml b/templates/desktop/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml rename to templates/desktop/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml diff --git a/desktop/user/30-gnome/evolution-2.6/.evolution/signatures/default b/templates/desktop/30-gnome/evolution-2.6/.evolution/signatures/default similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.evolution/signatures/default rename to templates/desktop/30-gnome/evolution-2.6/.evolution/signatures/default diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/%gconf.xml b/templates/desktop/30-gnome/evolution-2.6/.gconf/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.gconf/%gconf.xml rename to templates/desktop/30-gnome/evolution-2.6/.gconf/%gconf.xml diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/%gconf.xml b/templates/desktop/30-gnome/evolution-2.6/.gconf/apps/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.gconf/apps/%gconf.xml rename to templates/desktop/30-gnome/evolution-2.6/.gconf/apps/%gconf.xml diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/%gconf.xml b/templates/desktop/30-gnome/evolution-2.6/.gconf/apps/evolution/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/%gconf.xml rename to templates/desktop/30-gnome/evolution-2.6/.gconf/apps/evolution/%gconf.xml diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml b/templates/desktop/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml rename to templates/desktop/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml diff --git a/desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml b/templates/desktop/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml rename to templates/desktop/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/display/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.calculate/ini.env b/templates/desktop/30-gnome/gnome-2.6/.calculate/ini.env similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.calculate/ini.env rename to templates/desktop/30-gnome/gnome-2.6/.calculate/ini.env diff --git a/desktop/user/30-gnome/gnome-2.6/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/30-gnome/gnome-2.6/.config/autostart/fusion-icon-autostart.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.config/autostart/fusion-icon-autostart.desktop rename to templates/desktop/30-gnome/gnome-2.6/.config/autostart/fusion-icon-autostart.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.config/autostart/fusion-icon-remove.desktop b/templates/desktop/30-gnome/gnome-2.6/.config/autostart/fusion-icon-remove.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.config/autostart/fusion-icon-remove.desktop rename to templates/desktop/30-gnome/gnome-2.6/.config/autostart/fusion-icon-remove.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.config/compiz/compizconfig/config b/templates/desktop/30-gnome/gnome-2.6/.config/compiz/compizconfig/config similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.config/compiz/compizconfig/config rename to templates/desktop/30-gnome/gnome-2.6/.config/compiz/compizconfig/config diff --git a/desktop/user/30-gnome/gnome-2.6/.config/compiz/fusion-icon b/templates/desktop/30-gnome/gnome-2.6/.config/compiz/fusion-icon similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.config/compiz/fusion-icon rename to templates/desktop/30-gnome/gnome-2.6/.config/compiz/fusion-icon diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gksu/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gksu/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gksu/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gksu/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gksu/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gksu/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gksu/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gksu/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/glipper/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/glipper/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/glipper/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/glipper/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/general/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/general/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/general/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/general/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/global/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/global/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/global/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/global/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome-terminal/profiles/Default/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/metacity/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/metacity/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/metacity/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/metacity/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/metacity/general/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/metacity/general/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/metacity/general/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/metacity/general/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/metacity/global_keybindings/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/metacity/global_keybindings/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/metacity/global_keybindings/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/metacity/global_keybindings/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/nautilus/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/nautilus/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/preferences/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/nautilus/preferences/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/preferences/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/nautilus/preferences/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/100_mainmenu/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/100_mainmenu/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/100_mainmenu/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/100_mainmenu/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/101_home/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/101_home/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/101_home/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/101_home/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/prefs/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/prefs/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/prefs/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/104_workspaceswitcher/prefs/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/prefs/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/prefs/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/prefs/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/101_top_applets_left/105_windowlist/prefs/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/202_lock/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/202_lock/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/202_lock/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/202_lock/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/prefs/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/prefs/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/prefs/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/203_clock/prefs/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/204_mixer/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/204_mixer/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/204_mixer/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/204_mixer/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/205_notification/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/205_notification/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/205_notification/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/205_notification/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/206_glipper/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/206_glipper/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/206_glipper/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/206_glipper/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/207_keylayout/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/207_keylayout/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/207_keylayout/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/207_keylayout/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/208_trash/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/208_trash/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/208_trash/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/201_top_applets_right/208_trash/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/300_webbrowser/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/301_mail/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/301_mail/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/301_mail/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/301_mail/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/302_irc/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/302_irc/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/302_irc/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/302_irc/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/303_jabber/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/303_jabber/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/303_jabber/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/303_jabber/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/304_oowriter/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/304_oowriter/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/304_oowriter/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/304_oowriter/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/305_oocalc/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/305_oocalc/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/305_oocalc/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/305_oocalc/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/306_calculator/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/306_calculator/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/306_calculator/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/306_calculator/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/307_imageeditor/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/307_imageeditor/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/307_imageeditor/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/307_imageeditor/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/308_imageviewer/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/308_imageviewer/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/308_imageviewer/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/308_imageviewer/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/309_audioplayer/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/309_audioplayer/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/309_audioplayer/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/309_audioplayer/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/310_videoplayer/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/310_videoplayer/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/310_videoplayer/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/310_videoplayer/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/311_cdburner/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/311_cdburner/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/311_cdburner/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/311_cdburner/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/312_dictionary/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/312_dictionary/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/312_dictionary/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/312_dictionary/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/313_editor/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/313_editor/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/313_editor/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/313_editor/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/314_terminal/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/314_terminal/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/314_terminal/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/300_bottom_objects/314_terminal/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/background/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/background/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/background/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/bottom_panel_screen0/background/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/apps/panel/toplevels/top_panel_screen0/background/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/browser/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/media/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/media/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/media/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/applications/media/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/background/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/interface/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/interface/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/interface/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/interface/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_force_logout/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_force_logout/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_force_logout/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_force_logout/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_xkill/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_xkill/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_xkill/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_xkill/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/mouse/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/mouse/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/mouse/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/peripherals/mouse/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/session/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/about/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/http/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/https/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml rename to templates/desktop/30-gnome/gnome-2.6/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop b/templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop rename to templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop b/templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop rename to templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop b/templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop rename to templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd rename to templates/desktop/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/bsh-console-bsh.desktop b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/bsh-console-bsh.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/bsh-console-bsh.desktop rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/bsh-console-bsh.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/calculate-community.desktop b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/calculate-community.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/calculate-community.desktop rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/calculate-community.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/calculate-install.desktop b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/calculate-install.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/calculate-install.desktop rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/calculate-install.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/gfloppy.desktop b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/gfloppy.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/gfloppy.desktop rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/gfloppy.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/gnomecc.desktop b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/gnomecc.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/gnomecc.desktop rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/gnomecc.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/gparted.desktop b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/gparted.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/gparted.desktop rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/gparted.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/applications/mimeapps.list b/templates/desktop/30-gnome/gnome-2.6/.local/share/applications/mimeapps.list similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/applications/mimeapps.list rename to templates/desktop/30-gnome/gnome-2.6/.local/share/applications/mimeapps.list diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/AudioVideo.directory b/templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/AudioVideo.directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/AudioVideo.directory rename to templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/AudioVideo.directory diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings-System.directory b/templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings-System.directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings-System.directory rename to templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings-System.directory diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings.directory b/templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings.directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings.directory rename to templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/Settings.directory diff --git a/desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/Utility.directory b/templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/Utility.directory similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.local/share/desktop-directories/Utility.directory rename to templates/desktop/30-gnome/gnome-2.6/.local/share/desktop-directories/Utility.directory diff --git a/desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml b/templates/desktop/30-gnome/gnome-2.6/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml rename to templates/desktop/30-gnome/gnome-2.6/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml diff --git a/desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml b/templates/desktop/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml rename to templates/desktop/30-gnome/gnome-2.6/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml diff --git a/desktop/user/30-gnome/gnome-2.6/Desktop/README.desktop b/templates/desktop/30-gnome/gnome-2.6/Desktop/README.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/Desktop/README.desktop rename to templates/desktop/30-gnome/gnome-2.6/Desktop/README.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/Desktop/calculate-community.desktop b/templates/desktop/30-gnome/gnome-2.6/Desktop/calculate-community.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/Desktop/calculate-community.desktop rename to templates/desktop/30-gnome/gnome-2.6/Desktop/calculate-community.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/Desktop/calculate-install.desktop b/templates/desktop/30-gnome/gnome-2.6/Desktop/calculate-install.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/Desktop/calculate-install.desktop rename to templates/desktop/30-gnome/gnome-2.6/Desktop/calculate-install.desktop diff --git a/desktop/user/30-gnome/gnome-2.6/Desktop/gparted.desktop b/templates/desktop/30-gnome/gnome-2.6/Desktop/gparted.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-2.6/Desktop/gparted.desktop rename to templates/desktop/30-gnome/gnome-2.6/Desktop/gparted.desktop diff --git a/desktop/user/30-gnome/gnome-always/.calculate_directory b/templates/desktop/30-gnome/gnome-always/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-always/.calculate_directory rename to templates/desktop/30-gnome/gnome-always/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-always/.gconf/%gconf.xml b/templates/desktop/30-gnome/gnome-always/.gconf/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/%gconf.xml rename to templates/desktop/30-gnome/gnome-always/.gconf/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/%gconf.xml b/templates/desktop/30-gnome/gnome-always/.gconf/apps/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/%gconf.xml rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/%gconf.xml b/templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/panel/%gconf.xml rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml b/templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory b/templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/.calculate_directory diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml b/templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove b/templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove diff --git a/desktop/user/30-gnome/gnome-always/.gconf/apps/panel/general/%gconf.xml b/templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/general/%gconf.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gconf/apps/panel/general/%gconf.xml rename to templates/desktop/30-gnome/gnome-always/.gconf/apps/panel/general/%gconf.xml diff --git a/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop b/templates/desktop/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop rename to templates/desktop/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop diff --git a/desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove b/templates/desktop/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove similarity index 100% rename from desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove rename to templates/desktop/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove diff --git a/desktop/user/30-gnome/gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml b/templates/desktop/30-gnome/gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml rename to templates/desktop/30-gnome/gnome-always/.nautilus/metafiles/file:%2F%2F%2Fhome%2Fguest%2FDesktop.xml diff --git a/desktop/user/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml b/templates/desktop/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml similarity index 100% rename from desktop/user/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml rename to templates/desktop/30-gnome/gnome-always/.nautilus/metafiles/x-nautilus-desktop:%2F%2F%2F.xml diff --git a/desktop/user/40-xfce/.calculate_directory b/templates/desktop/40-xfce/.calculate_directory similarity index 100% rename from desktop/user/40-xfce/.calculate_directory rename to templates/desktop/40-xfce/.calculate_directory diff --git a/desktop/user/40-xfce/claws-mail-3.7/.calculate/ini.env b/templates/desktop/40-xfce/claws-mail-3.7/.calculate/ini.env similarity index 100% rename from desktop/user/40-xfce/claws-mail-3.7/.calculate/ini.env rename to templates/desktop/40-xfce/claws-mail-3.7/.calculate/ini.env diff --git a/desktop/user/40-xfce/claws-mail-3.7/.calculate_directory b/templates/desktop/40-xfce/claws-mail-3.7/.calculate_directory similarity index 100% rename from desktop/user/40-xfce/claws-mail-3.7/.calculate_directory rename to templates/desktop/40-xfce/claws-mail-3.7/.calculate_directory diff --git a/desktop/user/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl b/templates/desktop/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl similarity index 100% rename from desktop/user/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl rename to templates/desktop/40-xfce/claws-mail-3.7/.claws-mail/accountrc.tmpl diff --git a/desktop/user/40-xfce/claws-mail-3.7/.claws-mail/clawsrc b/templates/desktop/40-xfce/claws-mail-3.7/.claws-mail/clawsrc similarity index 100% rename from desktop/user/40-xfce/claws-mail-3.7/.claws-mail/clawsrc rename to templates/desktop/40-xfce/claws-mail-3.7/.claws-mail/clawsrc diff --git a/desktop/user/40-xfce/claws-mail-3.7/.signature b/templates/desktop/40-xfce/claws-mail-3.7/.signature similarity index 100% rename from desktop/user/40-xfce/claws-mail-3.7/.signature rename to templates/desktop/40-xfce/claws-mail-3.7/.signature diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.calculate_directory b/templates/desktop/40-xfce/cldx-10.2-10.4/.calculate_directory similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.calculate_directory rename to templates/desktop/40-xfce/cldx-10.2-10.4/.calculate_directory diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/Thunar/volmanrc b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/Thunar/volmanrc similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/Thunar/volmanrc rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/Thunar/volmanrc diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/autostart/fusion-icon-autostart.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/autostart/fusion-icon-autostart.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/autostart/fusion-icon-autostart.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-clipman-plugin-autostart.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-clipman-plugin-autostart.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-clipman-plugin-autostart.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-tips-autostart.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-tips-autostart.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-tips-autostart.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/autostart/xfce4-tips-autostart.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/menus/xfce-applications.menu b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/menus/xfce-applications.menu similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/menus/xfce-applications.menu rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/menus/xfce-applications.menu diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/desktop/icons.screen0.rc diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-30.rc diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-31.rc diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/launcher-43.rc diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/panels.xml diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/xkb-plugin-8.rc b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/xkb-plugin-8.rc similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/xkb-plugin-8.rc rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/panel/xkb-plugin-8.rc diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to templates/desktop/40-xfce/cldx-10.2-10.4/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/Thunar.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/Thunar.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/Thunar.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/Thunar.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/defaults.list b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/defaults.list similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/defaults.list rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/defaults.list diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/epdfview.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/epdfview.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/epdfview.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/epdfview.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/gparted.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/gparted.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/gparted.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/gparted.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce-keyboard-settings.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce-keyboard-settings.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce-keyboard-settings.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce-keyboard-settings.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-about-xfce.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-about-xfce.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-about-xfce.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-about-xfce.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-help.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-help.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-help.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-help.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-run-program.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-run-program.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-run-program.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-run-program.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-taskmanager.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-taskmanager.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-taskmanager.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xfce4-taskmanager.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xscreensaver-properties.desktop b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xscreensaver-properties.desktop similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/applications/xscreensaver-properties.desktop rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/applications/xscreensaver-properties.desktop diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-accessories.directory b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-accessories.directory similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-accessories.directory rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-accessories.directory diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-multimedia.directory b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-multimedia.directory similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-multimedia.directory rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-multimedia.directory diff --git a/desktop/user/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-network.directory b/templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-network.directory similarity index 100% rename from desktop/user/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-network.directory rename to templates/desktop/40-xfce/cldx-10.2-10.4/.local/share/desktop-directories/xfce-network.directory diff --git a/desktop/user/40-xfce/xfce-4.6/.calculate/ini.env b/templates/desktop/40-xfce/xfce-4.6/.calculate/ini.env similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.calculate/ini.env rename to templates/desktop/40-xfce/xfce-4.6/.calculate/ini.env diff --git a/desktop/user/40-xfce/xfce-4.6/.calculate_directory b/templates/desktop/40-xfce/xfce-4.6/.calculate_directory similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.calculate_directory rename to templates/desktop/40-xfce/xfce-4.6/.calculate_directory diff --git a/desktop/user/40-xfce/xfce-4.6/.config/Terminal/terminalrc b/templates/desktop/40-xfce/xfce-4.6/.config/Terminal/terminalrc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/Terminal/terminalrc rename to templates/desktop/40-xfce/xfce-4.6/.config/Terminal/terminalrc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/Thunar/thunarrc b/templates/desktop/40-xfce/xfce-4.6/.config/Thunar/thunarrc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/Thunar/thunarrc rename to templates/desktop/40-xfce/xfce-4.6/.config/Thunar/thunarrc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/Thunar/volmanrc b/templates/desktop/40-xfce/xfce-4.6/.config/Thunar/volmanrc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/Thunar/volmanrc rename to templates/desktop/40-xfce/xfce-4.6/.config/Thunar/volmanrc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/autostart/xfce4-clipman-plugin-autostart.desktop b/templates/desktop/40-xfce/xfce-4.6/.config/autostart/xfce4-clipman-plugin-autostart.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/autostart/xfce4-clipman-plugin-autostart.desktop rename to templates/desktop/40-xfce/xfce-4.6/.config/autostart/xfce4-clipman-plugin-autostart.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.config/autostart/xfce4-tips-autostart.desktop b/templates/desktop/40-xfce/xfce-4.6/.config/autostart/xfce4-tips-autostart.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/autostart/xfce4-tips-autostart.desktop rename to templates/desktop/40-xfce/xfce-4.6/.config/autostart/xfce4-tips-autostart.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.config/menus/xfce-applications.menu b/templates/desktop/40-xfce/xfce-4.6/.config/menus/xfce-applications.menu similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/menus/xfce-applications.menu rename to templates/desktop/40-xfce/xfce-4.6/.config/menus/xfce-applications.menu diff --git a/desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc b/templates/desktop/40-xfce/xfce-4.6/.config/mousepad/mousepadrc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/mousepad/mousepadrc rename to templates/desktop/40-xfce/xfce-4.6/.config/mousepad/mousepadrc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/desktop/icons.screen0.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/helpers.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/helpers.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/helpers.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/helpers.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/actions-12.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/actions-12.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/actions-12.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/actions-12.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/battmon-13.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/battmon-13.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/battmon-13.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/battmon-13.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/datetime-10.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/datetime-10.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/datetime-10.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/datetime-10.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-20.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-20.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-20.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-20.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-21.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-21.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-21.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-21.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-22.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-22.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-22.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-22.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-23.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-23.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-23.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-23.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-30.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-30.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-30.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-30.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-31.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-31.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-31.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-31.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-32.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-32.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-32.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-32.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-33.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-33.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-33.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-33.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-34.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-34.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-34.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-34.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-35.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-35.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-35.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-35.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-36.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-36.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-36.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-36.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-37.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-37.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-37.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-37.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-38.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-38.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-38.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-38.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-39.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-39.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-39.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-39.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-40.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-40.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-40.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-40.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-41.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-41.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-41.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-41.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-42.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-42.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-42.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-42.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-43.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-43.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-43.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-43.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-44.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-44.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-44.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/launcher-44.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/pager-3.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/pager-3.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/pager-3.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/pager-3.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/panels.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/separator-50.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/separator-50.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/separator-50.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/separator-50.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/separator-51.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/separator-51.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/separator-51.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/separator-51.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/separator-52.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/separator-52.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/separator-52.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/separator-52.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/systray-6.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/systray-6.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/systray-6.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/systray-6.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/tasklist-5.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/tasklist-5.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/tasklist-5.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/tasklist-5.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-menu-1.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-menu-1.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-menu-1.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-menu-1.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-mixer-plugin-9.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-mixer-plugin-9.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-mixer-plugin-9.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/xfce4-mixer-plugin-9.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/xkb-plugin-8.rc b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/xkb-plugin-8.rc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/panel/xkb-plugin-8.rc rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/panel/xkb-plugin-8.rc diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfprint.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml b/templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml rename to templates/desktop/40-xfce/xfce-4.6/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml diff --git a/desktop/user/40-xfce/xfce-4.6/.gqview/gqviewrc b/templates/desktop/40-xfce/xfce-4.6/.gqview/gqviewrc similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.gqview/gqviewrc rename to templates/desktop/40-xfce/xfce-4.6/.gqview/gqviewrc diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/Thunar.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/Thunar.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/Thunar.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/Thunar.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/audacious2-gtkui.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/audacious2-gtkui.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/audacious2-gtkui.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/audacious2-gtkui.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/audacious2.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/audacious2.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/audacious2.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/audacious2.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/defaults.list b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/defaults.list similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/defaults.list rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/defaults.list diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/epdfview.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/epdfview.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/epdfview.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/epdfview.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/gparted.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/gparted.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/gparted.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/gparted.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce-keyboard-settings.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce-keyboard-settings.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce-keyboard-settings.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce-keyboard-settings.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-about-xfce.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-about-xfce.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-about-xfce.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-about-xfce.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-help.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-help.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-help.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-help.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-run-program.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-run-program.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-run-program.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-run-program.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-taskmanager.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-taskmanager.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/xfce4-taskmanager.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xfce4-taskmanager.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/applications/xscreensaver-properties.desktop b/templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xscreensaver-properties.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/applications/xscreensaver-properties.desktop rename to templates/desktop/40-xfce/xfce-4.6/.local/share/applications/xscreensaver-properties.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory b/templates/desktop/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory rename to templates/desktop/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-accessories.directory diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-multimedia.directory b/templates/desktop/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-multimedia.directory similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-multimedia.directory rename to templates/desktop/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-multimedia.directory diff --git a/desktop/user/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-network.directory b/templates/desktop/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-network.directory similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-network.directory rename to templates/desktop/40-xfce/xfce-4.6/.local/share/desktop-directories/xfce-network.directory diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop b/templates/desktop/40-xfce/xfce-4.6/Desktop/Disks.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/Disks.desktop rename to templates/desktop/40-xfce/xfce-4.6/Desktop/Disks.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop b/templates/desktop/40-xfce/xfce-4.6/Desktop/FTP.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/FTP.desktop rename to templates/desktop/40-xfce/xfce-4.6/Desktop/FTP.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop b/templates/desktop/40-xfce/xfce-4.6/Desktop/Home.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/Home.desktop rename to templates/desktop/40-xfce/xfce-4.6/Desktop/Home.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/README.desktop?os_root_type==livecd b/templates/desktop/40-xfce/xfce-4.6/Desktop/README.desktop?os_root_type==livecd similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/README.desktop?os_root_type==livecd rename to templates/desktop/40-xfce/xfce-4.6/Desktop/README.desktop?os_root_type==livecd diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/calculate-community.desktop b/templates/desktop/40-xfce/xfce-4.6/Desktop/calculate-community.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/calculate-community.desktop rename to templates/desktop/40-xfce/xfce-4.6/Desktop/calculate-community.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/calculate-install.desktop b/templates/desktop/40-xfce/xfce-4.6/Desktop/calculate-install.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/calculate-install.desktop rename to templates/desktop/40-xfce/xfce-4.6/Desktop/calculate-install.desktop diff --git a/desktop/user/40-xfce/xfce-4.6/Desktop/gparted.desktop b/templates/desktop/40-xfce/xfce-4.6/Desktop/gparted.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-4.6/Desktop/gparted.desktop rename to templates/desktop/40-xfce/xfce-4.6/Desktop/gparted.desktop diff --git a/desktop/user/40-xfce/xfce-always/.calculate_directory b/templates/desktop/40-xfce/xfce-always/.calculate_directory similarity index 100% rename from desktop/user/40-xfce/xfce-always/.calculate_directory rename to templates/desktop/40-xfce/xfce-always/.calculate_directory diff --git a/desktop/user/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc b/templates/desktop/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc similarity index 100% rename from desktop/user/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc rename to templates/desktop/40-xfce/xfce-always/.config/xfce4/desktop/icons.screen0.rc diff --git a/desktop/user/40-xfce/xfce-always/.config/xfce4/panel/launcher-22.rc b/templates/desktop/40-xfce/xfce-always/.config/xfce4/panel/launcher-22.rc similarity index 100% rename from desktop/user/40-xfce/xfce-always/.config/xfce4/panel/launcher-22.rc rename to templates/desktop/40-xfce/xfce-always/.config/xfce4/panel/launcher-22.rc diff --git a/desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml b/templates/desktop/40-xfce/xfce-always/.config/xfce4/panel/panels.xml similarity index 100% rename from desktop/user/40-xfce/xfce-always/.config/xfce4/panel/panels.xml rename to templates/desktop/40-xfce/xfce-always/.config/xfce4/panel/panels.xml diff --git a/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop b/templates/desktop/40-xfce/xfce-always/Desktop/FTP.desktop similarity index 100% rename from desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop rename to templates/desktop/40-xfce/xfce-always/Desktop/FTP.desktop diff --git a/desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop.remove b/templates/desktop/40-xfce/xfce-always/Desktop/FTP.desktop.remove similarity index 100% rename from desktop/user/40-xfce/xfce-always/Desktop/FTP.desktop.remove rename to templates/desktop/40-xfce/xfce-always/Desktop/FTP.desktop.remove diff --git a/desktop/user/60-application/.calculate_directory b/templates/desktop/60-application/.calculate_directory similarity index 100% rename from desktop/user/60-application/.calculate_directory rename to templates/desktop/60-application/.calculate_directory diff --git a/desktop/user/60-application/bash-3.0/.bashrc b/templates/desktop/60-application/bash-3.0/.bashrc similarity index 100% rename from desktop/user/60-application/bash-3.0/.bashrc rename to templates/desktop/60-application/bash-3.0/.bashrc diff --git a/desktop/user/60-application/bash-3.0/.calculate/ini.env b/templates/desktop/60-application/bash-3.0/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/bash-3.0/.calculate/ini.env rename to templates/desktop/60-application/bash-3.0/.calculate/ini.env diff --git a/desktop/user/60-application/bash-3.0/.calculate_directory b/templates/desktop/60-application/bash-3.0/.calculate_directory similarity index 100% rename from desktop/user/60-application/bash-3.0/.calculate_directory rename to templates/desktop/60-application/bash-3.0/.calculate_directory diff --git a/desktop/user/60-application/chromium-5.0/.calculate/ini.env b/templates/desktop/60-application/chromium-5.0/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/chromium-5.0/.calculate/ini.env rename to templates/desktop/60-application/chromium-5.0/.calculate/ini.env diff --git a/desktop/user/60-application/chromium-5.0/.calculate_directory b/templates/desktop/60-application/chromium-5.0/.calculate_directory similarity index 100% rename from desktop/user/60-application/chromium-5.0/.calculate_directory rename to templates/desktop/60-application/chromium-5.0/.calculate_directory diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/Cached Theme.pak diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYktsBDA diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYltMBDA diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYmtMBDA diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/i/agxjaHJvbWV0aGVtZXNyDAsSBEZpbGUYoaQBDA diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Extensions/hnfhcmjkebafbfikmbkhdpbmfpfjgiog/1.0/manifest.json diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/Default/Preferences b/templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Preferences similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/Default/Preferences rename to templates/desktop/60-application/chromium-5.0/.config/chromium/Default/Preferences diff --git a/desktop/user/60-application/chromium-5.0/.config/chromium/First Run b/templates/desktop/60-application/chromium-5.0/.config/chromium/First Run similarity index 100% rename from desktop/user/60-application/chromium-5.0/.config/chromium/First Run rename to templates/desktop/60-application/chromium-5.0/.config/chromium/First Run diff --git a/desktop/user/60-application/compiz-0.8.4/.calculate/ini.env b/templates/desktop/60-application/compiz-0.8.4/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.calculate/ini.env rename to templates/desktop/60-application/compiz-0.8.4/.calculate/ini.env diff --git a/desktop/user/60-application/compiz-0.8.4/.calculate_directory b/templates/desktop/60-application/compiz-0.8.4/.calculate_directory similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.calculate_directory rename to templates/desktop/60-application/compiz-0.8.4/.calculate_directory diff --git a/desktop/user/60-application/compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/60-application/compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop rename to templates/desktop/60-application/compiz-0.8.4/.config/autostart/fusion-icon-autostart.desktop diff --git a/desktop/user/60-application/compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop b/templates/desktop/60-application/compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop rename to templates/desktop/60-application/compiz-0.8.4/.config/autostart/fusion-icon-remove.desktop diff --git a/desktop/user/60-application/compiz-0.8.4/.config/compiz/compizconfig/config b/templates/desktop/60-application/compiz-0.8.4/.config/compiz/compizconfig/config similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.config/compiz/compizconfig/config rename to templates/desktop/60-application/compiz-0.8.4/.config/compiz/compizconfig/config diff --git a/desktop/user/60-application/compiz-0.8.4/.config/compiz/fusion-icon b/templates/desktop/60-application/compiz-0.8.4/.config/compiz/fusion-icon similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.config/compiz/fusion-icon rename to templates/desktop/60-application/compiz-0.8.4/.config/compiz/fusion-icon diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/general/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/general/allscreens/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/animation/screen0/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/decoration/allscreens/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/move/allscreens/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/place/screen0/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/scale/allscreens/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/snap/screen0/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/staticswitcher/screen0/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/vpswitch/allscreens/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/%gconf.xml diff --git a/desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml b/templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml similarity index 100% rename from desktop/user/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml rename to templates/desktop/60-application/compiz-0.8.4/.gconf/apps/compiz/plugins/wall/allscreens/options/%gconf.xml diff --git a/desktop/user/60-application/compiz-always/.calculate_directory b/templates/desktop/60-application/compiz-always/.calculate_directory similarity index 100% rename from desktop/user/60-application/compiz-always/.calculate_directory rename to templates/desktop/60-application/compiz-always/.calculate_directory diff --git a/desktop/user/60-application/compiz-always/.config/autostart/fusion-icon-autostart.desktop b/templates/desktop/60-application/compiz-always/.config/autostart/fusion-icon-autostart.desktop similarity index 100% rename from desktop/user/60-application/compiz-always/.config/autostart/fusion-icon-autostart.desktop rename to templates/desktop/60-application/compiz-always/.config/autostart/fusion-icon-autostart.desktop diff --git a/desktop/user/60-application/compiz-always/.config/autostart/fusion-icon-remove.desktop b/templates/desktop/60-application/compiz-always/.config/autostart/fusion-icon-remove.desktop similarity index 100% rename from desktop/user/60-application/compiz-always/.config/autostart/fusion-icon-remove.desktop rename to templates/desktop/60-application/compiz-always/.config/autostart/fusion-icon-remove.desktop diff --git a/desktop/user/60-application/compiz-always/.config/compiz/compizconfig/config b/templates/desktop/60-application/compiz-always/.config/compiz/compizconfig/config similarity index 100% rename from desktop/user/60-application/compiz-always/.config/compiz/compizconfig/config rename to templates/desktop/60-application/compiz-always/.config/compiz/compizconfig/config diff --git a/desktop/user/60-application/compiz-always/.config/compiz/fusion-icon b/templates/desktop/60-application/compiz-always/.config/compiz/fusion-icon similarity index 100% rename from desktop/user/60-application/compiz-always/.config/compiz/fusion-icon rename to templates/desktop/60-application/compiz-always/.config/compiz/fusion-icon diff --git a/desktop/user/60-application/fbreader-0.1/.FBReader/ui.xml b/templates/desktop/60-application/fbreader-0.1/.FBReader/ui.xml similarity index 100% rename from desktop/user/60-application/fbreader-0.1/.FBReader/ui.xml rename to templates/desktop/60-application/fbreader-0.1/.FBReader/ui.xml diff --git a/desktop/user/60-application/fbreader-0.1/.calculate/ini.env b/templates/desktop/60-application/fbreader-0.1/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/fbreader-0.1/.calculate/ini.env rename to templates/desktop/60-application/fbreader-0.1/.calculate/ini.env diff --git a/desktop/user/60-application/fbreader-0.1/.calculate_directory b/templates/desktop/60-application/fbreader-0.1/.calculate_directory similarity index 100% rename from desktop/user/60-application/fbreader-0.1/.calculate_directory rename to templates/desktop/60-application/fbreader-0.1/.calculate_directory diff --git a/desktop/user/60-application/firefox-3.5/.calculate/ini.env b/templates/desktop/60-application/firefox-3.5/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/firefox-3.5/.calculate/ini.env rename to templates/desktop/60-application/firefox-3.5/.calculate/ini.env diff --git a/desktop/user/60-application/firefox-3.5/.calculate_directory b/templates/desktop/60-application/firefox-3.5/.calculate_directory similarity index 100% rename from desktop/user/60-application/firefox-3.5/.calculate_directory rename to templates/desktop/60-application/firefox-3.5/.calculate_directory diff --git a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop b/templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop similarity index 100% rename from desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop rename to templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop diff --git a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del b/templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del similarity index 100% rename from desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del rename to templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.5.desktop.del diff --git a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop b/templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop similarity index 100% rename from desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop rename to templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop diff --git a/desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del b/templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del similarity index 100% rename from desktop/user/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del rename to templates/desktop/60-application/firefox-3.5/.local/share/applications/mozilla-firefox-3.6.desktop.del diff --git a/desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory b/templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory similarity index 100% rename from desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory rename to templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/.calculate_directory diff --git a/desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini b/templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini similarity index 100% rename from desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini rename to templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_eng.ini diff --git a/desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini b/templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini similarity index 100% rename from desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini rename to templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/adblockplus/patterns_rus.ini diff --git a/desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf b/templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf similarity index 100% rename from desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf rename to templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/mimeTypes.rdf diff --git a/desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/prefs.js b/templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/prefs.js similarity index 100% rename from desktop/user/60-application/firefox-3.5/.mozilla/firefox/calculate.default/prefs.js rename to templates/desktop/60-application/firefox-3.5/.mozilla/firefox/calculate.default/prefs.js diff --git a/desktop/user/60-application/firefox-3.5/.mozilla/firefox/profiles.ini b/templates/desktop/60-application/firefox-3.5/.mozilla/firefox/profiles.ini similarity index 100% rename from desktop/user/60-application/firefox-3.5/.mozilla/firefox/profiles.ini rename to templates/desktop/60-application/firefox-3.5/.mozilla/firefox/profiles.ini diff --git a/desktop/user/60-application/firefox-always/.calculate_directory b/templates/desktop/60-application/firefox-always/.calculate_directory similarity index 100% rename from desktop/user/60-application/firefox-always/.calculate_directory rename to templates/desktop/60-application/firefox-always/.calculate_directory diff --git a/desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop b/templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop similarity index 100% rename from desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop rename to templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop diff --git a/desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del b/templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del similarity index 100% rename from desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del rename to templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.5.desktop.del diff --git a/desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop b/templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop similarity index 100% rename from desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop rename to templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop diff --git a/desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del b/templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del similarity index 100% rename from desktop/user/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del rename to templates/desktop/60-application/firefox-always/.local/share/applications/mozilla-firefox-3.6.desktop.del diff --git a/desktop/user/60-application/firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf b/templates/desktop/60-application/firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf similarity index 100% rename from desktop/user/60-application/firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf rename to templates/desktop/60-application/firefox-always/.mozilla/firefox/calculate.default/mimeTypes.rdf diff --git a/desktop/user/60-application/gimp-2.6/.calculate/ini.env b/templates/desktop/60-application/gimp-2.6/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/gimp-2.6/.calculate/ini.env rename to templates/desktop/60-application/gimp-2.6/.calculate/ini.env diff --git a/desktop/user/60-application/gimp-2.6/.calculate_directory b/templates/desktop/60-application/gimp-2.6/.calculate_directory similarity index 100% rename from desktop/user/60-application/gimp-2.6/.calculate_directory rename to templates/desktop/60-application/gimp-2.6/.calculate_directory diff --git a/desktop/user/60-application/gimp-2.6/.local/share/applications/gimp.desktop b/templates/desktop/60-application/gimp-2.6/.local/share/applications/gimp.desktop similarity index 100% rename from desktop/user/60-application/gimp-2.6/.local/share/applications/gimp.desktop rename to templates/desktop/60-application/gimp-2.6/.local/share/applications/gimp.desktop diff --git a/desktop/user/60-application/konversation-1.2/.calculate/ini.env b/templates/desktop/60-application/konversation-1.2/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/konversation-1.2/.calculate/ini.env rename to templates/desktop/60-application/konversation-1.2/.calculate/ini.env diff --git a/desktop/user/60-application/konversation-1.2/.calculate_directory b/templates/desktop/60-application/konversation-1.2/.calculate_directory similarity index 100% rename from desktop/user/60-application/konversation-1.2/.calculate_directory rename to templates/desktop/60-application/konversation-1.2/.calculate_directory diff --git a/desktop/user/60-application/konversation-1.2/.kde4/share/config/konversation.notifyrc b/templates/desktop/60-application/konversation-1.2/.kde4/share/config/konversation.notifyrc similarity index 100% rename from desktop/user/60-application/konversation-1.2/.kde4/share/config/konversation.notifyrc rename to templates/desktop/60-application/konversation-1.2/.kde4/share/config/konversation.notifyrc diff --git a/desktop/user/60-application/konversation-1.2/.kde4/share/config/konversationrc b/templates/desktop/60-application/konversation-1.2/.kde4/share/config/konversationrc similarity index 100% rename from desktop/user/60-application/konversation-1.2/.kde4/share/config/konversationrc rename to templates/desktop/60-application/konversation-1.2/.kde4/share/config/konversationrc diff --git a/desktop/user/60-application/konversation-always/.calculate_directory b/templates/desktop/60-application/konversation-always/.calculate_directory similarity index 100% rename from desktop/user/60-application/konversation-always/.calculate_directory rename to templates/desktop/60-application/konversation-always/.calculate_directory diff --git a/desktop/user/60-application/konversation-always/.kde4/share/config/konversationrc b/templates/desktop/60-application/konversation-always/.kde4/share/config/konversationrc similarity index 100% rename from desktop/user/60-application/konversation-always/.kde4/share/config/konversationrc rename to templates/desktop/60-application/konversation-always/.kde4/share/config/konversationrc diff --git a/desktop/user/60-application/mc-4.7/.calculate/ini.env b/templates/desktop/60-application/mc-4.7/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/mc-4.7/.calculate/ini.env rename to templates/desktop/60-application/mc-4.7/.calculate/ini.env diff --git a/desktop/user/60-application/mc-4.7/.calculate_directory b/templates/desktop/60-application/mc-4.7/.calculate_directory similarity index 100% rename from desktop/user/60-application/mc-4.7/.calculate_directory rename to templates/desktop/60-application/mc-4.7/.calculate_directory diff --git a/desktop/user/60-application/mc-4.7/.mc/ini b/templates/desktop/60-application/mc-4.7/.mc/ini similarity index 100% rename from desktop/user/60-application/mc-4.7/.mc/ini rename to templates/desktop/60-application/mc-4.7/.mc/ini diff --git a/desktop/user/60-application/openoffice-3.2/.calculate/ini.env b/templates/desktop/60-application/openoffice-3.2/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/openoffice-3.2/.calculate/ini.env rename to templates/desktop/60-application/openoffice-3.2/.calculate/ini.env diff --git a/desktop/user/60-application/openoffice-3.2/.calculate_directory b/templates/desktop/60-application/openoffice-3.2/.calculate_directory similarity index 100% rename from desktop/user/60-application/openoffice-3.2/.calculate_directory rename to templates/desktop/60-application/openoffice-3.2/.calculate_directory diff --git a/desktop/user/60-application/openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu b/templates/desktop/60-application/openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu similarity index 100% rename from desktop/user/60-application/openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu rename to templates/desktop/60-application/openoffice-3.2/.ooo3/user/registry/data/org/openoffice/Office/Common.xcu diff --git a/desktop/user/60-application/pidgin-2.6/.calculate/ini.env b/templates/desktop/60-application/pidgin-2.6/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/pidgin-2.6/.calculate/ini.env rename to templates/desktop/60-application/pidgin-2.6/.calculate/ini.env diff --git a/desktop/user/60-application/pidgin-2.6/.calculate_directory b/templates/desktop/60-application/pidgin-2.6/.calculate_directory similarity index 100% rename from desktop/user/60-application/pidgin-2.6/.calculate_directory rename to templates/desktop/60-application/pidgin-2.6/.calculate_directory diff --git a/desktop/user/60-application/pidgin-2.6/.purple/accels b/templates/desktop/60-application/pidgin-2.6/.purple/accels similarity index 100% rename from desktop/user/60-application/pidgin-2.6/.purple/accels rename to templates/desktop/60-application/pidgin-2.6/.purple/accels diff --git a/desktop/user/60-application/pidgin-2.6/.purple/accounts.xml b/templates/desktop/60-application/pidgin-2.6/.purple/accounts.xml similarity index 100% rename from desktop/user/60-application/pidgin-2.6/.purple/accounts.xml rename to templates/desktop/60-application/pidgin-2.6/.purple/accounts.xml diff --git a/desktop/user/60-application/pidgin-2.6/.purple/gtkrc-2.0 b/templates/desktop/60-application/pidgin-2.6/.purple/gtkrc-2.0 similarity index 100% rename from desktop/user/60-application/pidgin-2.6/.purple/gtkrc-2.0 rename to templates/desktop/60-application/pidgin-2.6/.purple/gtkrc-2.0 diff --git a/desktop/user/60-application/pidgin-2.6/.purple/prefs.xml b/templates/desktop/60-application/pidgin-2.6/.purple/prefs.xml similarity index 100% rename from desktop/user/60-application/pidgin-2.6/.purple/prefs.xml rename to templates/desktop/60-application/pidgin-2.6/.purple/prefs.xml diff --git a/desktop/user/60-application/stardict-3.0/.calculate/ini.env b/templates/desktop/60-application/stardict-3.0/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/stardict-3.0/.calculate/ini.env rename to templates/desktop/60-application/stardict-3.0/.calculate/ini.env diff --git a/desktop/user/60-application/stardict-3.0/.calculate_directory b/templates/desktop/60-application/stardict-3.0/.calculate_directory similarity index 100% rename from desktop/user/60-application/stardict-3.0/.calculate_directory rename to templates/desktop/60-application/stardict-3.0/.calculate_directory diff --git a/desktop/user/60-application/stardict-3.0/.local/share/applications/stardict.desktop b/templates/desktop/60-application/stardict-3.0/.local/share/applications/stardict.desktop similarity index 100% rename from desktop/user/60-application/stardict-3.0/.local/share/applications/stardict.desktop rename to templates/desktop/60-application/stardict-3.0/.local/share/applications/stardict.desktop diff --git a/desktop/user/60-application/stardict-3.0/.stardict/stardict.cfg b/templates/desktop/60-application/stardict-3.0/.stardict/stardict.cfg similarity index 100% rename from desktop/user/60-application/stardict-3.0/.stardict/stardict.cfg rename to templates/desktop/60-application/stardict-3.0/.stardict/stardict.cfg diff --git a/desktop/user/60-application/transmission-1.8/.calculate/ini.env b/templates/desktop/60-application/transmission-1.8/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/transmission-1.8/.calculate/ini.env rename to templates/desktop/60-application/transmission-1.8/.calculate/ini.env diff --git a/desktop/user/60-application/transmission-1.8/.calculate_directory b/templates/desktop/60-application/transmission-1.8/.calculate_directory similarity index 100% rename from desktop/user/60-application/transmission-1.8/.calculate_directory rename to templates/desktop/60-application/transmission-1.8/.calculate_directory diff --git a/desktop/user/60-application/transmission-1.8/.config/transmission/settings.json b/templates/desktop/60-application/transmission-1.8/.config/transmission/settings.json similarity index 100% rename from desktop/user/60-application/transmission-1.8/.config/transmission/settings.json rename to templates/desktop/60-application/transmission-1.8/.config/transmission/settings.json diff --git a/desktop/user/60-application/vim-7.0/.calculate/ini.env b/templates/desktop/60-application/vim-7.0/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/vim-7.0/.calculate/ini.env rename to templates/desktop/60-application/vim-7.0/.calculate/ini.env diff --git a/desktop/user/60-application/vim-7.0/.calculate_directory b/templates/desktop/60-application/vim-7.0/.calculate_directory similarity index 100% rename from desktop/user/60-application/vim-7.0/.calculate_directory rename to templates/desktop/60-application/vim-7.0/.calculate_directory diff --git a/desktop/user/60-application/vim-7.0/.vimrc b/templates/desktop/60-application/vim-7.0/.vimrc similarity index 100% rename from desktop/user/60-application/vim-7.0/.vimrc rename to templates/desktop/60-application/vim-7.0/.vimrc diff --git a/desktop/user/60-application/xchat-2.8/.calculate/ini.env b/templates/desktop/60-application/xchat-2.8/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/xchat-2.8/.calculate/ini.env rename to templates/desktop/60-application/xchat-2.8/.calculate/ini.env diff --git a/desktop/user/60-application/xchat-2.8/.calculate_directory b/templates/desktop/60-application/xchat-2.8/.calculate_directory similarity index 100% rename from desktop/user/60-application/xchat-2.8/.calculate_directory rename to templates/desktop/60-application/xchat-2.8/.calculate_directory diff --git a/desktop/user/60-application/xchat-2.8/.xchat2/xchat.conf b/templates/desktop/60-application/xchat-2.8/.xchat2/xchat.conf similarity index 100% rename from desktop/user/60-application/xchat-2.8/.xchat2/xchat.conf rename to templates/desktop/60-application/xchat-2.8/.xchat2/xchat.conf diff --git a/desktop/user/60-application/xchat-always/.calculate_directory b/templates/desktop/60-application/xchat-always/.calculate_directory similarity index 100% rename from desktop/user/60-application/xchat-always/.calculate_directory rename to templates/desktop/60-application/xchat-always/.calculate_directory diff --git a/desktop/user/60-application/xchat-always/.xchat2/xchat.conf b/templates/desktop/60-application/xchat-always/.xchat2/xchat.conf similarity index 100% rename from desktop/user/60-application/xchat-always/.xchat2/xchat.conf rename to templates/desktop/60-application/xchat-always/.xchat2/xchat.conf diff --git a/desktop/user/60-application/xscreensaver-5.10/.calculate/ini.env b/templates/desktop/60-application/xscreensaver-5.10/.calculate/ini.env similarity index 100% rename from desktop/user/60-application/xscreensaver-5.10/.calculate/ini.env rename to templates/desktop/60-application/xscreensaver-5.10/.calculate/ini.env diff --git a/desktop/user/60-application/xscreensaver-5.10/.calculate_directory b/templates/desktop/60-application/xscreensaver-5.10/.calculate_directory similarity index 100% rename from desktop/user/60-application/xscreensaver-5.10/.calculate_directory rename to templates/desktop/60-application/xscreensaver-5.10/.calculate_directory diff --git a/desktop/user/60-application/xscreensaver-5.10/.xscreensaver b/templates/desktop/60-application/xscreensaver-5.10/.xscreensaver similarity index 100% rename from desktop/user/60-application/xscreensaver-5.10/.xscreensaver rename to templates/desktop/60-application/xscreensaver-5.10/.xscreensaver diff --git a/desktop/user/80-patches/.calculate_directory b/templates/desktop/80-patches/.calculate_directory similarity index 100% rename from desktop/user/80-patches/.calculate_directory rename to templates/desktop/80-patches/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.16/.calculate/ini.env b/templates/desktop/80-patches/patch-2.1.16/.calculate/ini.env similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.calculate/ini.env rename to templates/desktop/80-patches/patch-2.1.16/.calculate/ini.env diff --git a/desktop/user/80-patches/patch-2.1.16/.calculate_directory b/templates/desktop/80-patches/patch-2.1.16/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.16/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.16/.config/xfce4/.calculate_directory b/templates/desktop/80-patches/patch-2.1.16/.config/xfce4/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.config/xfce4/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.16/.config/xfce4/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.16/.config/xfce4/panel/launcher-32.rc b/templates/desktop/80-patches/patch-2.1.16/.config/xfce4/panel/launcher-32.rc similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.config/xfce4/panel/launcher-32.rc rename to templates/desktop/80-patches/patch-2.1.16/.config/xfce4/panel/launcher-32.rc diff --git a/desktop/user/80-patches/patch-2.1.16/.kde4/.calculate_directory b/templates/desktop/80-patches/patch-2.1.16/.kde4/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.kde4/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.16/.kde4/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.16/.kde4/share/config/konversationrc b/templates/desktop/80-patches/patch-2.1.16/.kde4/share/config/konversationrc similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.kde4/share/config/konversationrc rename to templates/desktop/80-patches/patch-2.1.16/.kde4/share/config/konversationrc diff --git a/desktop/user/80-patches/patch-2.1.16/.kde4/share/config/kwinrc b/templates/desktop/80-patches/patch-2.1.16/.kde4/share/config/kwinrc similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.kde4/share/config/kwinrc rename to templates/desktop/80-patches/patch-2.1.16/.kde4/share/config/kwinrc diff --git a/desktop/user/80-patches/patch-2.1.16/.kde4/share/config/kxkbrc b/templates/desktop/80-patches/patch-2.1.16/.kde4/share/config/kxkbrc similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.kde4/share/config/kxkbrc rename to templates/desktop/80-patches/patch-2.1.16/.kde4/share/config/kxkbrc diff --git a/desktop/user/80-patches/patch-2.1.16/.local/share/applications/calculate-community.desktop b/templates/desktop/80-patches/patch-2.1.16/.local/share/applications/calculate-community.desktop similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.local/share/applications/calculate-community.desktop rename to templates/desktop/80-patches/patch-2.1.16/.local/share/applications/calculate-community.desktop diff --git a/desktop/user/80-patches/patch-2.1.16/.mozilla/firefox/.calculate_directory b/templates/desktop/80-patches/patch-2.1.16/.mozilla/firefox/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.mozilla/firefox/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.16/.mozilla/firefox/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf b/templates/desktop/80-patches/patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf rename to templates/desktop/80-patches/patch-2.1.16/.mozilla/firefox/calculate.default/mimeTypes.rdf diff --git a/desktop/user/80-patches/patch-2.1.16/Desktop/calculate-community.desktop b/templates/desktop/80-patches/patch-2.1.16/Desktop/calculate-community.desktop similarity index 100% rename from desktop/user/80-patches/patch-2.1.16/Desktop/calculate-community.desktop rename to templates/desktop/80-patches/patch-2.1.16/Desktop/calculate-community.desktop diff --git a/desktop/user/80-patches/patch-2.1.17/.calculate/ini.env b/templates/desktop/80-patches/patch-2.1.17/.calculate/ini.env similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.calculate/ini.env rename to templates/desktop/80-patches/patch-2.1.17/.calculate/ini.env diff --git a/desktop/user/80-patches/patch-2.1.17/.calculate_directory b/templates/desktop/80-patches/patch-2.1.17/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.17/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/.calculate_directory b/templates/desktop/80-patches/patch-2.1.17/.gconf/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.17/.gconf/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.br diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.de diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.es diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.fr diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.it diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.pl diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.ru diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.uk diff --git a/desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us b/templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us similarity index 100% rename from desktop/user/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us rename to templates/desktop/80-patches/patch-2.1.17/.gconf/desktop/gnome/peripherals/keyboard/kbd/%gconf.xml.us diff --git a/desktop/user/80-patches/patch-2.1.18/.calculate/ini.env b/templates/desktop/80-patches/patch-2.1.18/.calculate/ini.env similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.calculate/ini.env rename to templates/desktop/80-patches/patch-2.1.18/.calculate/ini.env diff --git a/desktop/user/80-patches/patch-2.1.18/.calculate_directory b/templates/desktop/80-patches/patch-2.1.18/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.18/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory b/templates/desktop/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.18/.config/xfce4/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.18/.config/xfce4/helpers.rc b/templates/desktop/80-patches/patch-2.1.18/.config/xfce4/helpers.rc similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.config/xfce4/helpers.rc rename to templates/desktop/80-patches/patch-2.1.18/.config/xfce4/helpers.rc diff --git a/desktop/user/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc b/templates/desktop/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc rename to templates/desktop/80-patches/patch-2.1.18/.config/xfce4/panel/launcher-30.rc diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/.calculate_directory b/templates/desktop/80-patches/patch-2.1.18/.gconf/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.18/.gconf/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/apps/panel/objects/300_webbrowser/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/applications/browser/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/about/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/chrome/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/ftp/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/http/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/https/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml b/templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml rename to templates/desktop/80-patches/patch-2.1.18/.gconf/desktop/gnome/url-handlers/unknown/%gconf.xml diff --git a/desktop/user/80-patches/patch-2.1.18/.gnome2/.calculate_directory b/templates/desktop/80-patches/patch-2.1.18/.gnome2/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gnome2/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.18/.gnome2/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd b/templates/desktop/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd rename to templates/desktop/80-patches/patch-2.1.18/.gnome2/panel2.d/default/launchers/README.desktop?os_root_type==livecd diff --git a/desktop/user/80-patches/patch-2.1.18/.kde4/.calculate_directory b/templates/desktop/80-patches/patch-2.1.18/.kde4/.calculate_directory similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.kde4/.calculate_directory rename to templates/desktop/80-patches/patch-2.1.18/.kde4/.calculate_directory diff --git a/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals b/templates/desktop/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals rename to templates/desktop/80-patches/patch-2.1.18/.kde4/share/config/kdeglobals diff --git a/desktop/user/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc b/templates/desktop/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc rename to templates/desktop/80-patches/patch-2.1.18/.kde4/share/config/plasma-desktop-appletsrc diff --git a/desktop/user/80-patches/patch-2.1.18/.local/share/applications/defaults.list b/templates/desktop/80-patches/patch-2.1.18/.local/share/applications/defaults.list similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.local/share/applications/defaults.list rename to templates/desktop/80-patches/patch-2.1.18/.local/share/applications/defaults.list diff --git a/desktop/user/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list b/templates/desktop/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list rename to templates/desktop/80-patches/patch-2.1.18/.local/share/applications/mimeapps.list diff --git a/desktop/user/80-patches/patch-2.1.18/Desktop/README.desktop b/templates/desktop/80-patches/patch-2.1.18/Desktop/README.desktop similarity index 100% rename from desktop/user/80-patches/patch-2.1.18/Desktop/README.desktop rename to templates/desktop/80-patches/patch-2.1.18/Desktop/README.desktop diff --git a/desktop/user/99-final/.calculate/ini.env b/templates/desktop/99-final/.calculate/ini.env similarity index 100% rename from desktop/user/99-final/.calculate/ini.env rename to templates/desktop/99-final/.calculate/ini.env diff --git a/desktop/user/99-final/.calculate_directory b/templates/desktop/99-final/.calculate_directory similarity index 100% rename from desktop/user/99-final/.calculate_directory rename to templates/desktop/99-final/.calculate_directory diff --git a/desktop/system/install/.calculate_directory b/templates/install/.calculate_directory similarity index 100% rename from desktop/system/install/.calculate_directory rename to templates/install/.calculate_directory diff --git a/desktop/system/install/gdm/.calculate_directory b/templates/install/gdm/.calculate_directory similarity index 100% rename from desktop/system/install/gdm/.calculate_directory rename to templates/install/gdm/.calculate_directory diff --git a/desktop/system/install/gdm/PostLogin/.calculate_directory b/templates/install/gdm/PostLogin/.calculate_directory similarity index 100% rename from desktop/system/install/gdm/PostLogin/.calculate_directory rename to templates/install/gdm/PostLogin/.calculate_directory diff --git a/desktop/system/install/gdm/PostLogin/Default b/templates/install/gdm/PostLogin/Default similarity index 100% rename from desktop/system/install/gdm/PostLogin/Default rename to templates/install/gdm/PostLogin/Default diff --git a/desktop/system/install/gdm/PostSession/.calculate_directory b/templates/install/gdm/PostSession/.calculate_directory similarity index 100% rename from desktop/system/install/gdm/PostSession/.calculate_directory rename to templates/install/gdm/PostSession/.calculate_directory diff --git a/desktop/system/install/gdm/PostSession/00Default b/templates/install/gdm/PostSession/00Default similarity index 100% rename from desktop/system/install/gdm/PostSession/00Default rename to templates/install/gdm/PostSession/00Default diff --git a/desktop/system/install/gdm/PostSession/05Default b/templates/install/gdm/PostSession/05Default similarity index 100% rename from desktop/system/install/gdm/PostSession/05Default rename to templates/install/gdm/PostSession/05Default diff --git a/desktop/system/install/kdm/.calculate_directory b/templates/install/kdm/.calculate_directory similarity index 100% rename from desktop/system/install/kdm/.calculate_directory rename to templates/install/kdm/.calculate_directory diff --git a/desktop/system/install/kdm/kdmrc b/templates/install/kdm/kdmrc similarity index 100% rename from desktop/system/install/kdm/kdmrc rename to templates/install/kdm/kdmrc diff --git a/desktop/system/install/slim/.calculate_directory b/templates/install/slim/.calculate_directory similarity index 100% rename from desktop/system/install/slim/.calculate_directory rename to templates/install/slim/.calculate_directory diff --git a/desktop/system/install/slim/slim.conf b/templates/install/slim/slim.conf similarity index 100% rename from desktop/system/install/slim/slim.conf rename to templates/install/slim/slim.conf diff --git a/desktop/system/uninstall/.calculate_directory b/templates/uninstall/.calculate_directory similarity index 100% rename from desktop/system/uninstall/.calculate_directory rename to templates/uninstall/.calculate_directory diff --git a/desktop/system/uninstall/gdm/.calculate_directory b/templates/uninstall/gdm/.calculate_directory similarity index 100% rename from desktop/system/uninstall/gdm/.calculate_directory rename to templates/uninstall/gdm/.calculate_directory diff --git a/desktop/system/uninstall/gdm/PostLogin/.calculate_directory b/templates/uninstall/gdm/PostLogin/.calculate_directory similarity index 100% rename from desktop/system/uninstall/gdm/PostLogin/.calculate_directory rename to templates/uninstall/gdm/PostLogin/.calculate_directory diff --git a/desktop/system/uninstall/gdm/PostLogin/Default b/templates/uninstall/gdm/PostLogin/Default similarity index 100% rename from desktop/system/uninstall/gdm/PostLogin/Default rename to templates/uninstall/gdm/PostLogin/Default diff --git a/desktop/system/uninstall/gdm/PostSession/.calculate_directory b/templates/uninstall/gdm/PostSession/.calculate_directory similarity index 100% rename from desktop/system/uninstall/gdm/PostSession/.calculate_directory rename to templates/uninstall/gdm/PostSession/.calculate_directory diff --git a/desktop/system/uninstall/gdm/PostSession/00Default b/templates/uninstall/gdm/PostSession/00Default similarity index 100% rename from desktop/system/uninstall/gdm/PostSession/00Default rename to templates/uninstall/gdm/PostSession/00Default diff --git a/desktop/system/uninstall/gdm/PostSession/05Default b/templates/uninstall/gdm/PostSession/05Default similarity index 100% rename from desktop/system/uninstall/gdm/PostSession/05Default rename to templates/uninstall/gdm/PostSession/05Default diff --git a/desktop/system/uninstall/kdm/.calculate_directory b/templates/uninstall/kdm/.calculate_directory similarity index 100% rename from desktop/system/uninstall/kdm/.calculate_directory rename to templates/uninstall/kdm/.calculate_directory diff --git a/desktop/system/uninstall/kdm/kdmrc b/templates/uninstall/kdm/kdmrc similarity index 100% rename from desktop/system/uninstall/kdm/kdmrc rename to templates/uninstall/kdm/kdmrc diff --git a/desktop/system/uninstall/slim/.calculate_directory b/templates/uninstall/slim/.calculate_directory similarity index 100% rename from desktop/system/uninstall/slim/.calculate_directory rename to templates/uninstall/slim/.calculate_directory diff --git a/desktop/system/uninstall/slim/slim.conf b/templates/uninstall/slim/slim.conf similarity index 100% rename from desktop/system/uninstall/slim/slim.conf rename to templates/uninstall/slim/slim.conf