diff --git a/distribution.xml b/distribution.xml
index c4270aacf9..ace018e2a0 100644
--- a/distribution.xml
+++ b/distribution.xml
@@ -7,405 +7,19 @@
     <Description xml:lang="nl">PisiLinux 2.0 main Opslagplaats</Description>
     <Type>Core</Type>
     <BinaryName>PisiLinux</BinaryName>
-    <Obsoletes> 
-        <Package>kde-baseapps</Package>
-        <Package>kdgantt2</Package>
-        <Package>gpgmepp</Package>
-        <Package>prison-qt5</Package>
-        <Package>xorg-video-modesetting</Package>
-        <Package>glamor-egl</Package>
-        <Package>glamor-egl-devel</Package>
-        <Package>kdeadmin</Package>
-        <Package>kdenetwork</Package>
-        <Package>kdenetwork-devel</Package>
-        <Package>kdesdk</Package>
-        <Package>kdesdk-devel</Package>
-        <Package>kdeplasma-applets-fancytasks</Package>
-        <Package>kdetoys</Package>
-        <Package>libfakeley</Package>
-        <Package>libfakeley-devel</Package>
-        <Package>libstreams</Package>
-        <Package>libstreamanalyzer</Package>
-        <Package>libstreams-devel</Package>
-        <Package>libstreamanalyzer-devel</Package>
-        <Package>strigi-libs</Package>
-        <Package>strigi-common</Package>
-        <Package>workspace-strap</Package>
-        <Package>gtk-qt-engine</Package>
-        <Package>kdevplatform-l10n-nds</Package>
-        <Package>kdevplatform-l10n-en_GB</Package>
-        <Package>db5</Package>
-        <Package>db5-devel</Package>
-        <Package>db5-docs</Package>
-        <Package>ntfs_3g</Package>
-        <Package>db4-java</Package>
-        <Package>db5-java</Package>
-        <Package>jpeg</Package>
-        <Package>openthreads</Package>
-        <Package>aufs-progs</Package>
-        <Package>python-cherrypy</Package>
-        <Package>hd2u</Package>
-        <Package>mmpython</Package>
-        <Package>libtextcat</Package>
-        <Package>xorg-input-fpit</Package>
-        <Package>xorg-input-hyperpen</Package>
-        <Package>xorg-input-mutouch</Package>
-        <Package>xorg-input-penmount</Package>
-        <Package>xorg-video-ark</Package>
-        <Package>xorg-video-ast</Package>
-        <Package>xorg-video-chips</Package>
-        <Package>xorg-video-nv</Package>
-        <Package>xorg-video-s3</Package>
-        <Package>xorg-video-tseng</Package>
-        <Package>libXp-devel</Package>
-        <Package>ijs</Package>
-        <Package>ijs-devel</Package>
-        <Package>xfce-utils</Package>
-        <Package>lxsession-edit</Package>
-        <Package>zeitgeist-datahub</Package>
-        <Package>soundKonverter</Package>
-        <Package>module-fglrx-legacy</Package>
-        <Package>module-fglrx-legacy-userspace</Package>
-        <Package>module-fglrx-legacy-devel</Package>
-        <Package>fglrx-legacy-devel</Package>
-        <Package>fglrx-legacy-opencl</Package>
-        <Package>fglrx-legacy-opencl-32bit</Package>
-        <Package>xorg-video-fglrx-legacy</Package>
-        <Package>xorg-video-fglrx-legacy-32bit</Package>
-        <Package>fglrx-devel</Package>
-        <Package>fglrx-opencl-32bit</Package>
-        <Package>fglrx-opencl</Package>
-        <Package>module-fglrx-userspace</Package>
-        <Package>plex-media-server</Package>
-        <Package>libreoffice-bsh</Package>
-        <Package>libreoffice-ure</Package>
-        <Package>libreoffice-pyuno</Package>
-        <Package>libreoffice-nlpsolver</Package>
-        <Package>libreoffice-pdfimport</Package>
-        <Package>libreoffice-xsltfilter</Package>
-        <Package>libreoffice-java-common</Package>
-        <Package>libreoffice-graphicfilter</Package>
-        <Package>libreoffice-wiki-publisher</Package>
-        <Package>libreoffice-presentation-minimizer</Package>
-        <Package>libreoffice-javafilter</Package>
-        <Package>libreoffice-report-builder</Package>
-        <Package>glest</Package>
-        <Package>glest-data</Package>
-        <Package>liboldX</Package>
-        <Package>liboldX-devel</Package>
-        <Package>glitz-devel</Package>
-        <Package>glitz-32bit</Package>
-        <Package>glitz</Package>
-        <Package>mate-bluetooth</Package>
-        <Package>mate-bluetooth-devel</Package>
-        <Package>mate-bluetooth-doc</Package>
-        <Package>glade-xfce</Package>
-        <Package>eatmonkey</Package>
-        <Package>gnome-activity-journal</Package>
-        <Package>gnome-mime-data</Package>
-        <Package>libgnomecups</Package>
-        <Package>libgnomecups-devel</Package>
-        <Package>libgnomeprint</Package>
-        <Package>libgnomeprint-devel</Package>
-        <Package>libgnomeprint-docs</Package>
-        <Package>libgnomeprintui</Package>
-        <Package>libgnomeprintui-devel</Package>
-        <Package>libgnomeprintui-docs</Package>
-        <Package>gnome-desktop-sharp</Package>
-        <Package>gnome-desktop-sharp-devel</Package>
-        <Package>gnome-print-sharp</Package>
-        <Package>gnome-print-sharp-devel</Package>
-        <Package>gtksourceview-sharp</Package>
-        <Package>gtksourceview-sharp-devel</Package>
-        <Package>vte-sharp</Package>
-        <Package>vte-sharp-devel</Package>
-        <Package>wnck-sharp</Package>
-        <Package>wnck-sharp-devel</Package>
-        <Package>rsvg-sharp</Package>
-        <Package>rsvg-sharp-devel</Package>
-        <Package>gsettings-desktop-schemas3</Package>
-        <Package>gsettings-desktop-schemas3-devel</Package>
-        <Package>libgee-8</Package>
-        <Package>libgee-8-devel</Package>
-        <Package>gnutls-guile</Package>
-        <Package>liborcus</Package>
-        <Package>liborcus-devel</Package>
-        <Package>libixion</Package>
-        <Package>epdfview</Package>
-        <Package>libixion-devel</Package>
-        <Package>lv2core</Package>
-        <Package>lv2core-devel</Package>
-        <Package>amd-ucode</Package>
-        <Package>akonadi-facebook</Package>
-        <Package>perl-Email-Simple-Creator</Package>
-        <Package>licq-autoreply</Package>
-        <Package>licq-console</Package>
-        <Package>licq-msn</Package>
-        <Package>licq-forwarder</Package>
-        <Package>licq-osd</Package>
-        <Package>licq-rms</Package>
-        <Package>licq-devel</Package>
-        <Package>perl-IO-via-symlink</Package>
-        <Package>SVK</Package>
-        <Package>avidemux</Package>
-        <Package>qsvn</Package>
-        <Package>libsvnqt</Package>
-        <Package>libsvnqt-devel</Package>
-        <Package>cups-php</Package>
-        <Package>metalink</Package>
-        <Package>foomatic-filters</Package>
-        <Package>pisilinux-default-settings</Package>
-        <Package>mysql-client</Package>
-        <Package>mysql-lib</Package>
-        <Package>mysql-man-pages</Package>
-        <Package>mysql-server</Package>
-        <Package>sun-jre</Package>
-        <Package>sun-jdk</Package>
-        <Package>gnash</Package>
-        <Package>gnash-devel</Package>
-        <Package>gnash-klash</Package>
-        <Package>gst-buzztard</Package>
-        <Package>gst-buzztard-doc</Package>
-        <Package>libgst-buzztard</Package>
-        <Package>libgst-buzztard-devel</Package>
-        <Package>tv-viewer</Package>
-        <Package>module-nvidia-current-userspace</Package>
-        <Package>module-nvidia304-userspace</Package>
-        <Package>module-nvidia173-userspace</Package>
-        <Package>module-nvidia96-userspace</Package>
-        <Package>samba-swat</Package>
-        <Package>comp-scale</Package>
-        <Package>ntrack</Package>
-        <Package>ntrack-devel</Package>
-        <Package>ntrack-glib</Package>
-        <Package>ntrack-glib-devel</Package>
-        <Package>ntrack-gobject</Package>
-        <Package>ntrack-gobject-devel</Package>
-        <Package>ntrack-qt4</Package>
-        <Package>ntrack-qt4-devel</Package>
-        <Package>python-ntrack</Package>
-        <Package>qzion</Package>
-        <Package>qzion-devel</Package>
-        <Package>qedje-devel</Package>
-        <Package>qedje</Package>
-        <Package>ushare</Package>
-        <Package>udev-32bit</Package>
-        <!--Package>kde-l10n-fa</Package-->
-        <Package>kde-l10n-si</Package>
-        <Package>kde-l10n-si-doc</Package>
-        <Package>kde-l10n-tg</Package>
-        <Package>kde-l10n-tg-doc</Package>
-        <Package>kde-l10n-th</Package>
-        <Package>kde-l10n-th-doc</Package>
-        <!--Package>kdnssd</Package-->
-        <Package>mate-file-manager</Package>
-        <Package>mate-file-manager-devel</Package>
-        <Package>mate-file-manager-doc</Package>
-        <Package>mate-window-manager</Package>
-        <Package>mate-window-manager-devel</Package>
-        <Package>mate-doc-utils</Package>
-        <Package>libmatewnck-devel</Package>
-        <Package>libmatewnck-doc</Package>
-        <Package>libmatewnck</Package>
-        <Package>libmatekeyring</Package>
-        <Package>libmatekeyring-devel</Package>
-        <Package>libmatekeyring-doc</Package>
-        <Package>mate-keyring</Package>
-        <Package>mate-keyring-devel</Package>
-        <Package>mate-keyring-doc</Package>
-        <Package>mate-character-map</Package>
-        <Package>mate-character-map-devel</Package>
-        <Package>mate-document-viewer</Package>
-        <Package>mate-document-viewer-devel</Package>
-        <Package>mate-document-viewer-doc</Package>
-        <Package>mate-file-archiver</Package>
-        <Package>mate-image-viewer</Package>
-        <Package>mate-image-viewer-devel</Package>
-        <Package>mate-image-viewer-doc</Package>
-        <Package>mate-file-manager-gksu</Package>
-        <Package>mate-file-manager-sendto</Package>
-        <Package>mate-file-manager-sendto-devel</Package>
-        <Package>mate-file-manager-sendto-doc</Package>
-        <Package>mate-file-manager-share</Package>
-        <Package>mate-file-manager-open-terminal</Package>
-        <Package>mate-file-manager-image-converter</Package>
-        <Package>mate-text-editor</Package>
-        <Package>mate-text-editor-devel</Package>
-        <Package>mate-text-editor-gtk-doc</Package>
-        <Package>mate-menu-editor</Package>
-        <Package>kio-afc</Package>
-        <Package>epson-alc1100</Package>
-        <Package>thunderbird-lang-es-CL</Package>
-        <Package>emacs-emms</Package>
-        <Package>ecore</Package>
-        <Package>ecore-devel</Package>
-        <Package>edje</Package>
-        <Package>edje-devel</Package>
-        <Package>eet</Package>
-        <Package>eet-devel</Package>
-        <Package>eeze</Package>
-        <Package>eeze-devel</Package>
-        <Package>efreet</Package>
-        <Package>efreet-devel</Package>
-        <Package>eina</Package>
-        <Package>eina-devel</Package>
-        <Package>eio</Package>
-        <Package>eio-devel</Package>
-        <Package>emap</Package>
-        <Package>emap-devel</Package>
-        <Package>embryo</Package>
-        <Package>embryo-devel</Package>
-        <Package>epdf</Package>
-        <Package>epdf-devel</Package>
-        <Package>ethumb</Package>
-        <Package>ethumb-devel</Package>
-        <Package>evas</Package>
-        <Package>evas-devel</Package>
-        <Package>emotion-devel</Package>
-        <Package>emotion</Package>
-        <Package>firefox-devel</Package>
-        <Package>chipmunk</Package>
-        <Package>chipmunk-devel</Package>
-        <Package>e-module-alarm</Package>
-        <Package>e-module-calendar</Package>
-        <Package>e-module-comp-scale</Package>
-        <Package>e-module-cpu</Package>
-        <Package>e-module-deskshow</Package>
-        <Package>e-module-diskio</Package>
-        <Package>e-module-drawer</Package>
-        <Package>e-module-eektool</Package>
-        <Package>e-module-eenvader-fractal</Package>
-        <Package>e-module-elfe</Package>
-        <Package>e-module-empris</Package>
-        <Package>e-module-engage</Package>
-        <Package>e-module-eooorg</Package>
-        <Package>e-module-everything-aspell</Package>
-        <Package>e-module-everything-pidgin</Package>
-        <Package>e-module-everything-places</Package>
-        <Package>e-module-everything-shotgun</Package>
-        <Package>e-module-everything-skeleton</Package>
-        <Package>e-module-everything-tracker</Package>
-        <Package>e-module-everything-wallpaper</Package>
-        <Package>e-module-everything-websearch</Package>
-        <Package>e-module-eweather</Package>
-        <Package>e-module-exebuf</Package>
-        <Package>e-module-execwatch</Package>
-        <Package>e-module-flame</Package>
-        <Package>e-module-forecasts</Package>
-        <Package>e-module-iiirk</Package>
-        <Package>e-module-itask</Package>
-        <Package>e-module-mail</Package>
-        <Package>e-module-mem</Package>
-        <Package>e-module-moon</Package>
-        <Package>e-module-mpdule</Package>
-        <Package>e-module-net</Package>
-        <Package>e-module-news</Package>
-        <Package>e-module-penguins</Package>
-        <Package>e-module-photo</Package>
-        <Package>e-module-places</Package>
-        <Package>e-module-rain</Package>
-        <Package>e-module-screenshot</Package>
-        <Package>e-module-skel</Package>
-        <Package>e-module-snow</Package>
-        <Package>e-module-taskbar</Package>
-        <Package>e-module-tclock</Package>
-        <Package>e-module-uptime</Package>
-        <Package>e-module-weather</Package>
-        <Package>e-module-winlist-ng</Package>
-        <Package>e-module-winselector</Package>
-        <Package>e-module-wlan</Package>
-        <Package>econcentration</Package>
-        <Package>editje</Package>
-        <Package>emprint</Package>
-        <Package>enki</Package>
-        <Package>enlil</Package>
-        <Package>enlil-devel</Package>
-        <Package>etrophy</Package>
-        <Package>etrophy-devel</Package>
-        <Package>expedite</Package>
-        <Package>lightmediascanner</Package>
-        <Package>lightmediascanner-devel</Package>
-        <Package>libeweather</Package>
-        <Package>libeweather-devel</Package>
-        <Package>python-elementary-devel</Package>
-        <Package>python-elementary</Package>
-        <Package>python-edje-devel</Package>
-        <Package>python-edje</Package>
-        <Package>python-evas-devel</Package>
-        <Package>python-evas</Package>
-        <Package>python-ethumb-devel</Package>
-        <Package>python-ethumb</Package>
-        <Package>python-ecore-devel</Package>
-        <Package>python-ecore</Package>
-        <Package>python-speech-dispatcher</Package>
-        <Package>nepomuk-core</Package>
-        <Package>nepomuk-core-devel</Package>
-        <Package>nepomuk-widgets</Package>
-        <Package>nepomuk-widgets-devel</Package>
-        <Package>wine-gecko64</Package>
-        <Package>wine64</Package>
-        <Package>glade3</Package>
-        <Package>glade3-devel</Package>
-        <Package>glade3-docs</Package>
-        <Package>goocanvas</Package>
-        <Package>goocanvas-docs</Package>
-        <Package>goocanvas-devel</Package>
-        <Package>goocanvasmm</Package>
-        <Package>goocanvasmm-doc</Package>
-        <Package>goocanvasmm-devel</Package>
-        <Package>libgtkhtml2</Package>
-        <Package>libgtkhtml2-devel</Package>
-        <Package>bluez-compat</Package>
-        <Package>bluedevil-devel</Package>
-        <Package>akonadi-facebook</Package>
-        <Package>python-PyMT</Package>
-        <Package>python-PyMT-docs</Package>
-        <Package>OpenGTL</Package>
-        <Package>OpenGTL-devel</Package>
-        <Package>gtkdatabox-glade</Package>
-        <Package>gtkdatabox-docs</Package>
-        <Package>vo-aacenc</Package>
-        <Package>lxshortcut</Package>
-        <Package>libusbx</Package>
-        <Package>libusbx-devel</Package>
-        <Package>libusbx-32bit</Package>
-        <Package>labltk</Package>
-        <Package>udev</Package>
-        <Package>libudev</Package>
-        <Package>libgudev1</Package>
-        <Package>libudev-devel</Package>
-        <Package>libgudev1-devel</Package>
-        <Package>libudev-32bit</Package>
-        <Package>libgudev1-32bit</Package>
-        <Package>mdbtools-gui</Package>
-        <Package>module-nvidia96</Package>
-        <Package>xorg-video-nvidia96</Package>
-        <Package>module-nvidia173</Package>
-        <Package>xorg-video-nvidia173</Package>
-        <Package>libfm</Package>
-        <Package>lxappearance</Package>
-        <Package>lxappearance-obconf</Package>
-        <Package>lxde-common</Package>
-        <Package>lxde-menu-cache</Package>
-        <Package>lxinput</Package>
-        <Package>lxmenu-data</Package>
-        <Package>lxpanel</Package>
-        <Package>lxpolkit</Package>
-        <Package>lxrandr</Package>
-        <Package>lxsession</Package>
-        <Package>lxtask</Package>
-        <Package>lxterminal</Package>
-        <Package>pcmanfm</Package>
-        <Package>gpicview</Package>
-        <Package>lxlauncher</Package>
-        <Package>screengrab</Package>
-        <Package>ksnapshot</Package>
-        <Package>ksnapshot</Package>
-        <Package>module-fglrx</Package>
-        <Package>xorg-video-fglrx</Package>
-        <Package>xorg-video-fglrx-32bit</Package>
-        <Package>glibc-32bit</Package>
-        <Package>xf86-input-aiptek</Package>
-        <Package>llvm-ocaml</Package>
-    </Obsoletes>
+    <Obsoletes>
+           <!--glibc-32bit merge in glibc-->
+           <Package>glibc-32bit</Package>
+           <!-- separeted, replaced packages-->
+           <Package>kdgantt2</Package>
+           <Package>gpgmepp</Package>
+           <Package>kde-baseapps</Package>
+           <Package>prison-qt5</Package>
+           <Package>xorg-video-modesetting</Package>
+           <!--for yali -->
+           <Package>busybox-mkinitcpio</Package>
+           <Package>mkinitcpio</Package>
+           <Package>Calamares</Package>
+           <Package>calamares-theme-pisilinux</Package>
+      </Obsoletes>
 </PISI>