diff --git a/desktop/pisilinux/kaptan-qt6/actions.py b/desktop/pisilinux/kaptan-qt6/actions.py
new file mode 100644
index 0000000000..ccecd730e9
--- /dev/null
+++ b/desktop/pisilinux/kaptan-qt6/actions.py
@@ -0,0 +1,16 @@
+# -*- 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
+
+def build():
+ pythonmodules.compile(pyVer="3")
+
+def install():
+ pythonmodules.install(pyVer="3")
+
diff --git a/desktop/pisilinux/kaptan-qt6/files/kaptan-QtWidgets.patch b/desktop/pisilinux/kaptan-qt6/files/kaptan-QtWidgets.patch
new file mode 100644
index 0000000000..c05954f17c
--- /dev/null
+++ b/desktop/pisilinux/kaptan-qt6/files/kaptan-QtWidgets.patch
@@ -0,0 +1,22 @@
+diff -Nuar a/kaptan/kaptan.py b/kaptan/kaptan.py
+--- a/kaptan/kaptan.py 2021-04-03 21:29:51.000000000 +0300
++++ b/kaptan/kaptan.py 2023-10-31 11:29:42.336651225 +0300
+@@ -26,14 +26,15 @@
+ class Kaptan(QtWidgets.QWizard):
+ def __init__(self):
+ super().__init__()
++ self.setFixedSize(850, 600)
+
+ self.setWindowTitle(self.tr("Kaptan"))
+ self.setWindowIcon(QIcon.fromTheme("kaptan-icon"))
+ self.setMinimumSize(850, 600)
+ self.setMaximumSize(950, 620)
+- x = (QtWidgets.QDesktopWidget().size().width() - self.width()) / 2
+- y = (QtWidgets.QDesktopWidget().size().height() - self.height()) / 2
+- self.move(x, y)
++ # x = (QtWidgets.QDesktopWidget().size().width() - self.width()) / 2
++ # y = (QtWidgets.QDesktopWidget().size().height() - self.height()) / 2
++ # self.move(x, y)
+ self.setPixmap(QtWidgets.QWizard.LogoPixmap, QPixmap("/usr/share/kaptan/images/kaptan.png"))
+
+ self.setButtonText(QtWidgets.QWizard.NextButton, self.tr("Next"))
diff --git a/desktop/pisilinux/kaptan-qt6/files/screen.patch b/desktop/pisilinux/kaptan-qt6/files/screen.patch
new file mode 100644
index 0000000000..e845864945
--- /dev/null
+++ b/desktop/pisilinux/kaptan-qt6/files/screen.patch
@@ -0,0 +1,14 @@
+diff -Nuar a/kaptan5/kaptan.py b/kaptan5/kaptan.py
+--- a/kaptan5/kaptan.py 2017-04-05 12:46:42.000000000 +0300
++++ b/kaptan5/kaptan.py 2018-02-06 01:23:49.000000000 +0300
+@@ -36,8 +36,8 @@
+ self.setWindowIcon(QIcon.fromTheme("kaptan-icon"))
+ self.setMinimumSize(850, 600)
+ self.setMaximumSize(950, 620)
+- x = (QDesktopWidget().screen().width() - self.width())/2
+- y = (QDesktopWidget().screen().height() - self.height())/2
++ x = (QDesktopWidget().screenGeometry().width() - self.width())/2
++ y = (QDesktopWidget().screenGeometry().height() - self.height())/2
+ self.move(x, y)
+ self.setPixmap(QWizard.LogoPixmap, QPixmap(":/data/images/kaptan.png"))
+
diff --git a/desktop/pisilinux/kaptan-qt6/pspec.xml b/desktop/pisilinux/kaptan-qt6/pspec.xml
new file mode 100644
index 0000000000..f77f164d3b
--- /dev/null
+++ b/desktop/pisilinux/kaptan-qt6/pspec.xml
@@ -0,0 +1,56 @@
+
+
+
+
+ kaptan-qt6
+ https://pisilinux.org
+
+ Metehan Özbek
+ mthnzbk@gmail.com
+
+ GPLv3
+ kaptan
+ app:gui
+ Kaptan, Pisi Linux workspace configuration wizard
+ Kaptan lets you configure your workspace on first login.
+ https://github.com/PisiLinuxNew/kaptan-qt6/archive/refs/tags/1.0.tar.gz
+
+ python3-pyqt6-sip
+ python3-setuptools
+ python3-qt6-devel
+ python3-devel
+ qt6-linguist
+
+
+
+
+
+
+
+ kaptan-qt6
+
+ python3-qt6
+ python3-pyqt6-sip
+
+
+ /usr/bin
+ /usr/share/kaptan
+ /usr/lib/python3*/site-packages
+ /usr/share/applications
+ /usr/share/icons
+ /usr/share/doc
+ /usr/share/kaptan/languages
+ /etc
+
+
+
+
+
+ 2024-05-30
+ 8.0
+ first
+ Pisi Linux Community
+ admin@pisilinux.org
+
+
+
diff --git a/desktop/pisilinux/kaptan-qt6/translations.xml b/desktop/pisilinux/kaptan-qt6/translations.xml
new file mode 100644
index 0000000000..60cc4bb0f9
--- /dev/null
+++ b/desktop/pisilinux/kaptan-qt6/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/pisilinux-welcome-qt6/actions.py b/desktop/pisilinux/pisilinux-welcome-qt6/actions.py
new file mode 100644
index 0000000000..9141e8df85
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-welcome-qt6/actions.py
@@ -0,0 +1,14 @@
+# -*- 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
+
+def install():
+ pythonmodules.install(pyVer = "3")
+
+ #pisitools.insinto("/usr/share/welcome/data/media-content", "data/media-content/logo.png")
diff --git a/desktop/pisilinux/pisilinux-welcome-qt6/pspec.xml b/desktop/pisilinux/pisilinux-welcome-qt6/pspec.xml
new file mode 100644
index 0000000000..9ca024867c
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-welcome-qt6/pspec.xml
@@ -0,0 +1,54 @@
+
+
+
+
+ pisilinux-welcome-qt6
+ https://pisilinux.org
+
+ Metehan Özbek
+ mthnzbk@gmail.com
+
+ GPLv3
+ pisilinux-welcome
+ app:gui
+ Pisi Linux Welcome Application
+ Pisi Linux Welcome Application
+ https://github.com/PisiLinuxNew/pisilinux-welcome-qt6/archive/refs/tags/1.0.tar.gz
+
+ python3-qt6
+ qt6-linguist
+ python3-devel
+ python3-pyqt6-sip
+ python3-setuptools
+
+
+
+
+ pisilinux-welcome-qt6
+
+ python3-qt6
+ python3-pyqt6-sip
+
+
+ /etc
+ /usr/share/doc
+ /usr/bin
+ /usr/share
+ /usr/share/icons
+ /usr/share/pisilinux-welcome
+ /usr/share/applications
+ /usr/lib/python3*/site-packages
+ /usr/share/welcome/languages
+
+
+
+
+
+ 2024-05-30
+ 2.0
+ first
+ Pisi Linux Community
+ admin@pisilinux.org
+
+
+
diff --git a/desktop/pisilinux/pisilinux-welcome-qt6/translations.xml b/desktop/pisilinux/pisilinux-welcome-qt6/translations.xml
new file mode 100644
index 0000000000..6af4129a39
--- /dev/null
+++ b/desktop/pisilinux/pisilinux-welcome-qt6/translations.xml
@@ -0,0 +1,8 @@
+
+
+
+ pisilinux-welcome
+ Pisi Linux Hoşgeldin Uygulaması
+ Hoşgeldin uygulaması, bilgisayarınız ilk defa açıldığında sizi karşılar.
+
+