diff --git a/desktop/pisilinux/component.xml b/desktop/pisilinux/component.xml
new file mode 100644
index 0000000000..09c9401aa1
--- /dev/null
+++ b/desktop/pisilinux/component.xml
@@ -0,0 +1,3 @@
+
+ desktop.pisilinux
+
diff --git a/desktop/pisilinux/kaptan/actions.py b/desktop/pisilinux/kaptan/actions.py
new file mode 100644
index 0000000000..0a7881c15d
--- /dev/null
+++ b/desktop/pisilinux/kaptan/actions.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+import glob
+
+projectDir = "/usr/lib/kaptan/"
+
+def install():
+ for file in glob.glob1(".", "*"):
+ shelltools.chmod(file, 0755)
+
+ for file in glob.glob1("languages", "*"):
+ shelltools.chmod("languages/"+file, 0755)
+
+ for file in glob.glob1("kaptan", "*"):
+ shelltools.chmod("kaptan/"+file, 0755)
+
+ for file in glob.glob1("data", "*"):
+ shelltools.chmod("data/"+file, 0755)
+
+ for file in glob.glob1("data/images", "*"):
+ shelltools.chmod("data/images/"+file, 0755)
+
+ pisitools.insinto("/usr/share/pixmaps/", "data/images/kaptan-icon.png", "kaptan.png")
+ pisitools.insinto(projectDir, "data/")
+ pisitools.insinto(projectDir, "languages/")
+ pisitools.insinto(projectDir, "kaptan/")
+ pisitools.insinto(projectDir, "kaptan.py", "kaptan5.py")
+ pisitools.insinto(projectDir, "rc_kaptan.py")
+ pisitools.insinto("/usr/bin/", "script/kaptan")
+
+
+
diff --git a/desktop/pisilinux/kaptan/pspec.xml b/desktop/pisilinux/kaptan/pspec.xml
new file mode 100644
index 0000000000..e479a70955
--- /dev/null
+++ b/desktop/pisilinux/kaptan/pspec.xml
@@ -0,0 +1,48 @@
+
+
+
+
+ kaptan
+ http://pisilinux.org
+
+ Pisi Linux Admins
+ admins@pisilinux.org
+
+ GPLv2
+ kaptan
+ app:gui
+ Kaptan, Pisi Linux workspace configuration wizard
+ Kaptan lets you configure your workspace on first login.
+ https://github.com/PisiLinuxNew/kaptan/archive/5.0-beta.tar.gz
+
+ python3-setuptools
+ python3-qt5-devel
+ python3-devel
+
+
+
+
+ kaptan
+
+ python3-qt5
+
+
+ /usr/bin
+ /usr/lib/kaptan
+ /usr/lib/python3.4/site-packages
+ /usr/share/applications
+ /usr/share/pixmaps
+ /usr/share/doc
+
+
+
+
+
+ 2016-04-15
+ 5.0
+ First release
+ Metehan Özbek
+ admins@pisilinux.org
+
+
+
diff --git a/desktop/pisilinux/kaptan/translations.xml b/desktop/pisilinux/kaptan/translations.xml
new file mode 100644
index 0000000000..60cc4bb0f9
--- /dev/null
+++ b/desktop/pisilinux/kaptan/translations.xml
@@ -0,0 +1,10 @@
+
+
+
+ kaptan
+ Pisi Linux Kaptan
+ Pisi Linux Kaptan
+ Kaptan, bilgisayarınız ilk defa açıldığında çalışma ortamınızı kişiselleştirmenize yardımcı olur.
+ Kaptan, el asistente de inicio de Pisi Linux que le ayudará a personalizar su entorno de trabajo.
+
+
diff --git a/desktop/pisilinux/package-manager/actions.py b/desktop/pisilinux/package-manager/actions.py
new file mode 100644
index 0000000000..0896aa0007
--- /dev/null
+++ b/desktop/pisilinux/package-manager/actions.py
@@ -0,0 +1,21 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import kde4
+
+def install():
+ pythonmodules.install()
+
+ # Copy Notification Rc file for Kde 4
+ pisitools.insinto("%s/package-manager/" % kde4.appsdir, "src/package-manager.notifyrc")
+
+ for lang in ('de','en','es','fr','nl','sv','tr'):
+ pisitools.insinto("%s/html/%s/package-manager/" % (kde4.docdir, lang),
+ "help/%s/main_help.html" % lang, "index.html")
+
+
diff --git a/desktop/pisilinux/package-manager/files/appinfo.diff b/desktop/pisilinux/package-manager/files/appinfo.diff
new file mode 100644
index 0000000000..6c9fa88576
--- /dev/null
+++ b/desktop/pisilinux/package-manager/files/appinfo.diff
@@ -0,0 +1,48 @@
+diff -Nuar package-manager-4.0.0.orig/src/packagemodel.py package-manager-4.0.0/src/packagemodel.py
+--- package-manager-4.0.0.orig/src/packagemodel.py 2013-12-24 23:35:17.000000000 +0200
++++ package-manager-4.0.0/src/packagemodel.py 2014-01-12 16:28:56.483228983 +0200
+@@ -47,7 +47,7 @@
+
+ if config.USE_APPINFO:
+ self.appinfo = AppInfoClient()
+- self.appinfo.setServer('http://appinfo.pardus.org.tr')
++ self.appinfo.setServer('http://appinfo.pisilinux.org')
+ if not self.appinfo.initializeLocalDB()[0]:
+ self.appinfo.checkOutDB()
+
+diff -Nuar package-manager-4.0.0.orig/src/pmutils.py package-manager-4.0.0/src/pmutils.py
+--- package-manager-4.0.0.orig/src/pmutils.py 2013-12-24 23:35:16.000000000 +0200
++++ package-manager-4.0.0/src/pmutils.py 2014-01-12 16:29:17.453228944 +0200
+@@ -156,7 +156,7 @@
+ QNetworkProxy.setApplicationProxy(QNetworkProxy())
+
+ def network_available():
+- return pisi.fetcher.Fetcher('http://appinfo.pardus.org.tr').test()
++ return pisi.fetcher.Fetcher('http://appinfo.pisilinux.org').test()
+
+ def parse_proxy(line):
+ settings = {'domain':None,'user':None,'pass':None,'host':None,'port':None}
+diff -Nuar package-manager-4.0.0.orig/src/statemanager.py package-manager-4.0.0/src/statemanager.py
+--- package-manager-4.0.0.orig/src/statemanager.py 2013-12-24 23:35:17.000000000 +0200
++++ package-manager-4.0.0/src/statemanager.py 2014-01-12 16:29:49.533228560 +0200
+@@ -158,7 +158,7 @@
+ if config.USE_APPINFO:
+ if network_available():
+ if not AppInfoClient().checkOutDB()[0]:
+- AppInfoClient().setServer('http://appinfo.pardus.org.tr')
++ AppInfoClient().setServer('http://appinfo.pisilinux.org')
+ AppInfoClient().checkOutDB()
+
+ return True
+diff -Nuar package-manager-4.0.0.orig/src/webdialog.py package-manager-4.0.0/src/webdialog.py
+--- package-manager-4.0.0.orig/src/webdialog.py 2013-12-24 23:35:17.000000000 +0200
++++ package-manager-4.0.0/src/webdialog.py 2014-01-12 16:30:21.433228258 +0200
+@@ -41,7 +41,7 @@
+
+ self.registerFunction(IN, lambda: parent.statusBar().hide())
+ self.registerFunction(FINISHED, lambda: parent.statusBar().setVisible(not self.isVisible()))
+- self._as = 'http://appinfo.pardus.org.tr'
++ self._as = 'http://appinfo.pisilinux.org'
+ self.cancelButton.clicked.connect(self._hide)
+ self.cancelButton.setIcon(KIcon("cancel"))
+
diff --git a/desktop/pisilinux/package-manager/files/fix_get_real_paths.patch b/desktop/pisilinux/package-manager/files/fix_get_real_paths.patch
new file mode 100644
index 0000000000..28d652fb68
--- /dev/null
+++ b/desktop/pisilinux/package-manager/files/fix_get_real_paths.patch
@@ -0,0 +1,13 @@
+Index: package-manager-3.0.3/src/pmutils.py
+===================================================================
+--- package-manager-3.0.3.orig/src/pmutils.py
++++ package-manager-3.0.3/src/pmutils.py
+@@ -114,7 +114,7 @@ class PM:
+
+ def get_real_paths(packages):
+ # If packages are not from repo or remote, find their absolute paths
+- return map(lambda x: x if not x.endswith('pisi') or '://' in x else os.path.abspath(x), packages)
++ return map(lambda x: x if not x.endswith('.pisi') or '://' in x else os.path.abspath(x), packages)
+
+ def isAllLocal(packages):
+ return all(map(lambda x: x.endswith('.pisi') and not '://' in x, packages))
diff --git a/desktop/pisilinux/package-manager/files/package-manager-4.0.0-icon-options-add.patch b/desktop/pisilinux/package-manager/files/package-manager-4.0.0-icon-options-add.patch
new file mode 100644
index 0000000000..9f1b0b4875
--- /dev/null
+++ b/desktop/pisilinux/package-manager/files/package-manager-4.0.0-icon-options-add.patch
@@ -0,0 +1,37 @@
+diff -Nuar package-manager-4.0.0-OSmanOS/src/summarydialog.py package-manager-4.0.0/src/summarydialog.py
+--- package-manager-4.0.0-OSmanOS/src/summarydialog.py 2013-12-24 23:35:17.000000000 +0200
++++ package-manager-4.0.0/src/summarydialog.py 2014-12-07 19:07:40.849356751 +0200
+@@ -80,6 +80,19 @@
+ for desktopFile in desktopFiles:
+ self.addApplication(desktopFile)
+
++
++ def checkIcon(self, iconFileName):
++ extensions = ['png', 'jpg','jpeg', 'svg']
++ pixmapsDir = '/usr/share/pixmaps/'
++ if os.path.isfile(iconFileName) == True:
++ return iconFileName
++ else:
++ for ext in extensions:
++ fname = '%s%s.%s' % (pixmapsDir, iconFileName, ext)
++ if os.path.isfile(fname):
++ return fname
++
++
+ def addApplication(self, desktopFile):
+ parser = desktopparser.DesktopParser()
+ parser.read("/%s" % str(desktopFile))
+@@ -89,7 +102,7 @@
+ if nodisplay == "true" or terminal == "true":
+ return
+
+- icon = parser.safe_get_locale('Desktop Entry', 'Icon', None)
++ icon = self.checkIcon(parser.safe_get_locale('Desktop Entry', 'Icon', None))
+ command = parser.safe_get_locale('Desktop Entry', 'Exec', None)
+ if not command:
+ return
+@@ -117,4 +130,3 @@
+ def showSummary(self):
+ if self.hasApplication():
+ self.show()
+-
diff --git a/desktop/pisilinux/package-manager/files/webdialog_ui.patch b/desktop/pisilinux/package-manager/files/webdialog_ui.patch
new file mode 100644
index 0000000000..4614f1741f
--- /dev/null
+++ b/desktop/pisilinux/package-manager/files/webdialog_ui.patch
@@ -0,0 +1,35 @@
+--- ui/webdialog.ui.old 2014-02-13 00:22:36.000000000 +0400
++++ ui/webdialog.ui 2014-02-13 00:10:47.000000000 +0400
+@@ -232,15 +232,21 @@
+
+ -
+
++
++
++ 0
++ 0
++
++
+
+
+- 32
++ 36
+ 26
+
+
+
+
+- 24
++ 36
+ 26
+
+
+@@ -256,7 +262,7 @@
+
+
+
+-
++ X
+
+
+ true
diff --git a/desktop/pisilinux/package-manager/pspec.xml b/desktop/pisilinux/package-manager/pspec.xml
new file mode 100644
index 0000000000..5c73cb790e
--- /dev/null
+++ b/desktop/pisilinux/package-manager/pspec.xml
@@ -0,0 +1,51 @@
+
+
+
+
+ package-manager
+ http://www.pisilinux.org
+
+ PisiLinux Community
+ admins@pisilinux.org
+
+ GPLv2
+ app:gui
+ PiSi graphical user interface
+ Package Manager is PiSi's easy-to-use graphical user interface.
+ https://github.com/PisiLinuxNew/package-manager/archive/package-manager.4.1.1.tar.gz
+
+ docutils
+ python-qt5-devel
+ python-sip
+
+
+
+
+ package-manager
+
+ pisi
+ python-qt5
+
+ python-sip
+ pisilinux-desktop-services
+
+
+ /usr/bin
+ /usr/share
+ /usr/share/locale
+ /usr/share/applications
+ /usr/share/icons
+ /usr/share/doc
+
+
+
+
+
+ 2016-04-15
+ 4.1.1
+ ported pyqt5
+ Ayhan Yalçınsoy
+ ayhanyalcinsoy@pisilinux.org
+
+
+
diff --git a/desktop/pisilinux/package-manager/translations.xml b/desktop/pisilinux/package-manager/translations.xml
new file mode 100644
index 0000000000..310f34b151
--- /dev/null
+++ b/desktop/pisilinux/package-manager/translations.xml
@@ -0,0 +1,9 @@
+
+
+
+ package-manager
+ PiSi kullanıcı grafik arayüzü
+ PiSi paket yöneticisine ait paket kurma, kaldırma ve güncelleme gibi işlerin grafik ortamda yapılabilmesini sağlayan PiSi grafik arayüzü.
+ PiSi est une interface graphique permettant d'effectuer l'installation, la suppression et la mise à jour de paquet PiSi depuis un environnement graphique.
+
+
diff --git a/desktop/pisilinux/pisilinux-desktop-services/actions.py b/desktop/pisilinux/pisilinux-desktop-services/actions.py
new file mode 100644
index 0000000000..809ae0c12b
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-desktop-services/actions.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import get
+from pisi.actionsapi import pisitools
+
+#WorkDir = 'pds-%s' % get.srcVERSION()
+
+def build():
+ pythonmodules.compile()
+
+def install():
+ pythonmodules.install()
+ pisitools.domove("/usr/lib/python2.7/site-packages", "/usr/lib/python3.4")
+ pisitools.removeDir("/usr/lib/python2.7")
diff --git a/desktop/pisilinux/pisilinux-desktop-services/files/environment.patch b/desktop/pisilinux/pisilinux-desktop-services/files/environment.patch
new file mode 100644
index 0000000000..37095662d9
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-desktop-services/files/environment.patch
@@ -0,0 +1,41 @@
+--- pds/environments.py.orig 2011-07-04 16:43:22.000000000 +0300
++++ pds/environments.py 2014-01-13 23:48:50.387199790 +0200
+@@ -64,7 +64,7 @@
+ ConfigPath = '$HOME/.config/xfce4/'
+ ConfigFile = 'xfconf/xfce-perchannel-xml/xsettings.xml'
+ ConfigType = 'xml'
+- DefaultIconTheme = 'hicolor'
++ DefaultIconTheme = 'Faenza'
+ DefaultConfigPath = '/etc/xdg/xfce4/%s' % ConfigFile
+ IconKey = 'IconThemeName'
+
+@@ -74,7 +74,7 @@
+ ConfigPath = '$HOME/.e/e/'
+ ConfigFile = 'config/standard/e.cfg'
+ ConfigType = 'env'
+- DefaultIconTheme = 'hicolor'
++ DefaultIconTheme = 'Faenza'
+ IconKey = 'E_ICON_THEME'
+
+ class LXDE(DefaultDe):
+@@ -83,9 +83,9 @@
+ ConfigPath = '$HOME/.config'
+ ConfigFile = ''
+ ConfigType = None
+- DefaultIconTheme = 'oxygen'
++ DefaultIconTheme = 'Faenza'
+ IconKey = 'theme/name'
+- DefaultIconFile = '/usr/share/icons/lxde_pardus2011_menu.png'
++ DefaultIconFile = '/usr/share/lxde/images/pisilinuxLogo.png'
+
+ class Fluxbox(DefaultDe):
+ Name = 'fluxbox'
+@@ -93,7 +93,7 @@
+ ConfigPath = '$HOME/.config'
+ ConfigFile = ''
+ ConfigType = None
+- DefaultIconTheme = 'oxygen'
++ DefaultIconTheme = 'Faenza'
+
+ class Gnome(DefaultDe):
+ Name = 'gnome'
diff --git a/desktop/pisilinux/pisilinux-desktop-services/files/mate_support.patch b/desktop/pisilinux/pisilinux-desktop-services/files/mate_support.patch
new file mode 100644
index 0000000000..c9c42e6b14
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-desktop-services/files/mate_support.patch
@@ -0,0 +1,59 @@
+diff -aur pds~/environments.py pds/environments.py
+--- pds~/environments.py 2014-01-13 22:59:36.000000000 +0100
++++ pds/environments.py 2014-01-28 19:56:31.163320368 +0100
+@@ -113,3 +113,10 @@
+ ConfigType = None
+ DefaultIconTheme = 'oxygen'
+
++class Mate(DefaultDe):
++ Name = 'mate'
++ Version = '1.61'
++ ConfigPath = '$HOME/.config/mate'
++ ConfigFile = ''
++ ConfigType = None
++ DefaultIconTheme = 'matefaenza'
+diff -aur pds~/__init__.py pds/__init__.py
+--- pds~/__init__.py 2011-07-04 12:19:46.000000000 +0200
++++ pds/__init__.py 2014-01-28 22:22:56.729985428 +0100
+@@ -14,8 +14,9 @@
+
+ # Pardus Desktop Services
+ from os import path
+-from os import getenv
+ from os import popen
++from os import getenv
++from os import environ
+
+ import piksemel
+ import gettext
+@@ -32,7 +33,7 @@
+ class Pds:
+
+ SupportedDesktops = (DefaultDe, Kde4, Kde3, Xfce, Enlightenment, LXDE,
+- Fluxbox, Gnome, Gnome3)
++ Fluxbox, Gnome, Gnome3, Mate)
+
+ def __init__(self, catalogName='', debug=False):
+ self._session = None
+@@ -148,12 +149,19 @@
+ def session(self):
+ if not self._session:
+ env = getenv('DESKTOP_SESSION')
+- if env == 'default' or not env or env == 'gnome':
++ if not env:
++ for var in list(environ.keys()):
++ v = var.split('_')
++ if len(v) < 2: continue
++ elif v[1] == 'DESKTOP':
++ env = v[0].lower()
++ break
++ elif env == 'default' or env == 'gnome':
+ session = readfile('/etc/default/desktop', DefaultDe.Name)
+ env = session.split('=')[1].strip()
+ for de in Pds.SupportedDesktops:
+ if env:
+- if env in de.SessionTypes or env == de.Name:
++ if env in de.SessionTypes or env.lower() == de.Name.lower():
+ self._session = de
+ else:
+ if de.VersionKey:
diff --git a/desktop/pisilinux/pisilinux-desktop-services/pspec.xml b/desktop/pisilinux/pisilinux-desktop-services/pspec.xml
new file mode 100644
index 0000000000..ec1abc4887
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-desktop-services/pspec.xml
@@ -0,0 +1,46 @@
+
+
+
+
+ pisilinux-desktop-services
+ http://www.pisilinux.org
+
+ pisilinux Community
+ admins@pisilinux.org
+
+ GPLv2
+ library
+ Pisi Linux Desktop Services
+ pisilinux-desktop-services is a wrapper python module for integrating various desktop environments using PyQt.
+
+ https://github.com/PisiLinuxNew/pds/archive/2.0.0.tar.gz
+
+ python-qt5-devel
+
+
+
+
+
+
+
+ pisilinux-desktop-services
+
+ python-qt5
+
+
+ /usr/lib/python3.4/
+ /usr/share/
+
+
+
+
+
+ 2016-04-15
+ 2.0.0
+ Version bump.
+ Ayhan Yalçınsoy
+ ayhanyalcinsoy@pisilinux.org
+
+
+
diff --git a/desktop/pisilinux/pisilinux-desktop-services/translations.xml b/desktop/pisilinux/pisilinux-desktop-services/translations.xml
new file mode 100644
index 0000000000..979332beda
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-desktop-services/translations.xml
@@ -0,0 +1,8 @@
+
+
+
+ pisilinux-desktop-services
+ Pisi Linux Masaüstü Hizmetleri
+ pisilinux-desktop-services, Pisi Linux Uygulamalarının farklı masaüstü ortamları ile bütünleşik bir şekilde çalışmasını sağlayan bir Python modülüdür.
+
+