diff --git a/desktop/toolkit/qtermwidget-qt6/actions.py b/desktop/toolkit/qtermwidget6/actions.py
similarity index 100%
rename from desktop/toolkit/qtermwidget-qt6/actions.py
rename to desktop/toolkit/qtermwidget6/actions.py
diff --git a/desktop/toolkit/qtermwidget-qt6/pspec.xml b/desktop/toolkit/qtermwidget6/pspec.xml
similarity index 100%
rename from desktop/toolkit/qtermwidget-qt6/pspec.xml
rename to desktop/toolkit/qtermwidget6/pspec.xml
diff --git a/desktop/toolkit/qtermwidget-qt6/translations.xml b/desktop/toolkit/qtermwidget6/translations.xml
similarity index 100%
rename from desktop/toolkit/qtermwidget-qt6/translations.xml
rename to desktop/toolkit/qtermwidget6/translations.xml
diff --git a/pisi-index.xml b/pisi-index.xml
index 9fe0f33a0f..0e0ae4f05a 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -151919,26 +151919,26 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
             <Description xml:lang="en">The LXQt desktop panel</Description>
             <Description xml:lang="tr">lxqt-panel, LXQt masaüstü panelidir.</Description>
             <Icon>lxqt</Icon>
-            <Archive type="tarxz" sha1sum="f7f21b0b73ab3f7bef70236c26f0d4bbe5562596" name="lxqt-panel-1.4.0.tar.xz">https://github.com/lxqt/lxqt-panel/releases/download/1.4.0/lxqt-panel-1.4.0.tar.xz</Archive>
+            <Archive type="tarxz" sha1sum="15b6d9ffc815a9264ed3ea3300696adf4d3d3787" name="lxqt-panel-2.0.0.tar.xz">https://github.com/lxqt/lxqt-panel/releases/download/2.0.0/lxqt-panel-2.0.0.tar.xz</Archive>
             <BuildDependencies>
                 <Dependency>cmake</Dependency>
                 <Dependency>glib2-devel</Dependency>
-                <Dependency>kguiaddons-devel</Dependency>
-                <Dependency>kwindowsystem-devel</Dependency>
+                <Dependency>kguiaddons-kf6-devel</Dependency>
+                <Dependency>kwindowsystem-kf6-devel</Dependency>
                 <Dependency>libX11-devel</Dependency>
                 <Dependency>libXcomposite-devel</Dependency>
                 <Dependency>libXdamage-devel</Dependency>
-                <Dependency>libdbusmenu-qt-devel</Dependency>
                 <Dependency>libgcc</Dependency>
-                <Dependency versionFrom="1.4.0">liblxqt-devel</Dependency>
-                <Dependency versionFrom="3.12.0">libqtxdg-devel</Dependency>
+                <Dependency>libdbusmenu-lxqt-devel</Dependency>
+                <Dependency versionFrom="2.0.0">liblxqt-devel</Dependency>
+                <Dependency versionFrom="4.0.0">libqtxdg-devel</Dependency>
                 <Dependency>libxkbcommon-devel</Dependency>
                 <Dependency>lm_sensors-devel</Dependency>
-                <Dependency versionFrom="1.4.0">lxqt-globalkeys-devel</Dependency>
+                <Dependency versionFrom="2.0.0">lxqt-globalkeys-devel</Dependency>
                 <Dependency>pulseaudio-libs-devel</Dependency>
                 <Dependency>alsa-lib-devel</Dependency>
-                <Dependency>qt5-linguist</Dependency>
-                <Dependency>solid-devel</Dependency>
+                <Dependency>qt6-linguist</Dependency>
+                <Dependency>solid-kf6-devel</Dependency>
                 <Dependency versionFrom="0.4.5">libsysstat-devel</Dependency>
                 <Dependency>libstatgrab</Dependency>
                 <Dependency>libxcb-devel</Dependency>
@@ -151948,31 +151948,36 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
                 <Dependency>libXtst-devel</Dependency>
                 <Dependency>libXScrnSaver-devel</Dependency>
                 <Dependency>desktop-file-utils</Dependency>
-                <Dependency versionFrom="0.13.0">lxqt-build-tools</Dependency>
-                <Dependency versionFrom="1.4.0">lxqt-menu-data</Dependency>
+                <Dependency>layer-shell-qt-kf6-devel</Dependency>
+                <Dependency versionFrom="2.0.0">lxqt-build-tools</Dependency>
+                <Dependency versionFrom="2.0.0">lxqt-menu-data</Dependency>
             </BuildDependencies>
+            <Patches>
+                <Patch level="1">2053.patch</Patch>
+            </Patches>
             <SourceURI>desktop/lxqt/lxqt-panel/pspec.xml</SourceURI>
         </Source>
         <Package>
             <Name>lxqt-panel</Name>
             <RuntimeDependencies>
-                <Dependency>solid</Dependency>
+                <Dependency>solid-kf6</Dependency>
                 <Dependency>libgcc</Dependency>
                 <Dependency>libxcb</Dependency>
                 <Dependency>libXtst</Dependency>
+                <Dependency>libX11</Dependency>
                 <Dependency>liblxqt</Dependency>
                 <Dependency>alsa-lib</Dependency>
                 <Dependency>libqtxdg</Dependency>
-                <Dependency>qt5-svg</Dependency>
-                <Dependency>qt5-base</Dependency>
+                <Dependency>qt6-svg</Dependency>
+                <Dependency>qt6-base</Dependency>
                 <Dependency>xcb-util</Dependency>
                 <Dependency>libsysstat</Dependency>
                 <Dependency>lm_sensors</Dependency>
                 <Dependency>libstatgrab</Dependency>
                 <Dependency>libxkbcommon</Dependency>
-                <Dependency>kwindowsystem</Dependency>
-                <Dependency>qt5-x11extras</Dependency>
-                <Dependency>libdbusmenu-qt</Dependency>
+                <Dependency>kwindowsystem-kf6</Dependency>
+                <Dependency>libdbusmenu-lxqt</Dependency>
+                <Dependency>layer-shell-qt-kf6</Dependency>
                 <Dependency>xcb-util-image</Dependency>
                 <Dependency>lxqt-globalkeys</Dependency>
                 <Dependency>pulseaudio-libs</Dependency>
@@ -151994,13 +151999,20 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
             <Name>lxqt-panel-devel</Name>
             <Summary xml:lang="en">Development headers for lxqt-panel</Summary>
             <RuntimeDependencies>
-                <Dependency release="19">lxqt-panel</Dependency>
+                <Dependency release="20">lxqt-panel</Dependency>
             </RuntimeDependencies>
             <Files>
                 <Path fileType="header">/usr/include</Path>
             </Files>
         </Package>
         <History>
+            <Update release="20">
+                <Date>2024-04-18</Date>
+                <Version>2.0.0</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Mustafa Cinasal</Name>
+                <Email>muscnsl@gmail.com</Email>
+            </Update>
             <Update release="19">
                 <Date>2023-11-21</Date>
                 <Version>1.4.0</Version>
@@ -154002,25 +154014,25 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
             <Description xml:lang="en">File manager and desktop icon manager (Qt port of PCManFM and libfm)</Description>
             <Description xml:lang="tr">Dosya yöneticisi ve masaüstü simgesi yöneticisi (Qt PCManFM port ve libfm).</Description>
             <Icon>lxqt</Icon>
-            <Archive type="tarxz" sha1sum="26759a25369ee34c9584026ed066a6fe54d14c70" name="pcmanfm-qt-1.4.1.tar.xz">https://github.com/lxqt/pcmanfm-qt/releases/download/1.4.1/pcmanfm-qt-1.4.1.tar.xz</Archive>
+            <Archive type="tarxz" sha1sum="6f2545c47c25a581b608faef59f6a965b568aba7" name="pcmanfm-qt-2.0.0.tar.xz">https://github.com/lxqt/pcmanfm-qt/releases/download/2.0.0/pcmanfm-qt-2.0.0.tar.xz</Archive>
             <BuildDependencies>
                 <Dependency>cairo-devel</Dependency>
                 <Dependency>cmake</Dependency>
                 <Dependency>glib2-devel</Dependency>
-                <Dependency versionFrom="1.4.0">libfm-qt-devel</Dependency>
+                <Dependency versionFrom="2.0.0">libfm-qt-devel</Dependency>
                 <Dependency>libgcc</Dependency>
-                <Dependency versionFrom="1.4.0">liblxqt-devel</Dependency>
-                <Dependency versionFrom="3.12.0">libqtxdg-devel</Dependency>
+                <Dependency versionFrom="2.0.0">liblxqt-devel</Dependency>
+                <Dependency versionFrom="4.0.0">libqtxdg-devel</Dependency>
                 <Dependency>menu-cache-devel</Dependency>
                 <Dependency>libxcb-devel</Dependency>
-                <Dependency>libkexiv2-devel</Dependency>
-                <Dependency>qt5-base-devel</Dependency>
-                <Dependency>qt5-linguist</Dependency>
-                <Dependency>qt5-x11extras-devel</Dependency>
-                <Dependency>kwindowsystem-devel</Dependency>
+                <Dependency>libkexiv2-kf6-devel</Dependency>
+                <Dependency>qt6-base-devel</Dependency>
+                <Dependency>qt6-linguist</Dependency>
+                <Dependency>kwindowsystem-kf6-devel</Dependency>
                 <Dependency>libexif-devel</Dependency>
                 <Dependency>udisks2-devel</Dependency>
-                <Dependency versionFrom="0.13.0">lxqt-build-tools</Dependency>
+                <Dependency>layer-shell-qt-kf6-devel</Dependency>
+                <Dependency versionFrom="2.0.0">lxqt-build-tools</Dependency>
             </BuildDependencies>
             <SourceURI>desktop/lxqt/pcmanfm-qt/pspec.xml</SourceURI>
         </Source>
@@ -154031,12 +154043,12 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
                 <Dependency>libgcc</Dependency>
                 <Dependency>libxcb</Dependency>
                 <Dependency>libfm-qt</Dependency>
-                <Dependency>qt5-base</Dependency>
-                <Dependency>qt5-x11extras</Dependency>
-                <Dependency>breeze-icons</Dependency>
+                <Dependency>qt6-base</Dependency>
+                <Dependency>breeze-icons-kf6</Dependency>
                 <Dependency>gvfs</Dependency>
                 <Dependency>udisks2</Dependency>
                 <Dependency>menu-cache</Dependency>
+                <Dependency>layer-shell-qt-kf6</Dependency>
             </RuntimeDependencies>
             <Files>
                 <Path fileType="config">/etc</Path>
@@ -154050,6 +154062,13 @@ It supports email, address books, calendars, tasks, news feeds and much more.</D
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="21">
+                <Date>2024-04-18</Date>
+                <Version>2.0.0</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Mustafa Cinasal</Name>
+                <Email>muscnsl@gmail.com</Email>
+            </Update>
             <Update release="20">
                 <Date>2024-02-18</Date>
                 <Version>1.4.1</Version>
@@ -331927,69 +331946,6 @@ components such as the Settings and gnome-shell.</Description>
             </Update>
         </History>
     </SpecFile>
-    <SpecFile>
-        <Source>
-            <Name>qtermwidget6</Name>
-            <Homepage>https://github.com/lxqt/qtermwidget</Homepage>
-            <Packager>
-                <Name>Ayhan Yalçınsoy</Name>
-                <Email>ayhanyalcinsoy@pisilinux.org</Email>
-            </Packager>
-            <License>GPLv2</License>
-            <IsA>library</IsA>
-            <IsA>app:gui</IsA>
-            <PartOf>desktop.toolkit</PartOf>
-            <Summary xml:lang="en">Terminal widget for Qt5</Summary>
-            <Description xml:lang="en">A simple terminal widget for using with Qt5 based applications</Description>
-            <Archive type="zip" sha1sum="d45ccbb0c48fb2ef40e109ccab29dabf3d126107" name="7a25783c101f45a8ba1713f98c968b848103f5e3.zip">https://github.com/lxqt/qtermwidget/archive/7a25783c101f45a8ba1713f98c968b848103f5e3.zip</Archive>
-            <BuildDependencies>
-                <Dependency>cmake</Dependency>
-                <Dependency>libgcc</Dependency>
-                <Dependency versionFrom="2.0.0">lxqt-build-tools</Dependency>
-                <Dependency versionFrom="6.6.3">qt6-base-devel</Dependency>
-                <Dependency versionFrom="6.6.3">qt6-linguist</Dependency>
-                <Dependency versionFrom="6.6.3">qt6-5compat-devel</Dependency>
-            </BuildDependencies>
-            <SourceURI>desktop/toolkit/qtermwidget-qt6/pspec.xml</SourceURI>
-        </Source>
-        <Package>
-            <Name>qtermwidget6</Name>
-            <Summary xml:lang="en">Development files for qtermwidget6</Summary>
-            <RuntimeDependencies>
-                <Dependency>libgcc</Dependency>
-                <Dependency>qt6-base</Dependency>
-                <Dependency>qt6-5compat</Dependency>
-            </RuntimeDependencies>
-            <Files>
-                <Path fileType="executable">/usr/bin/consoleq</Path>
-                <Path fileType="library">/usr/lib</Path>
-                <Path fileType="data">/usr/share</Path>
-                <Path fileType="doc">/usr/share/doc</Path>
-            </Files>
-        </Package>
-        <Package>
-            <Name>qtermwidget6-devel</Name>
-            <Summary xml:lang="en">Development files for qtermwidget6</Summary>
-            <RuntimeDependencies>
-                <Dependency versionFrom="6.6.3">qt6-base-devel</Dependency>
-                <Dependency release="1">qtermwidget6</Dependency>
-            </RuntimeDependencies>
-            <Files>
-                <Path fileType="data">/usr/share/cmake/qtermwidget6</Path>
-                <Path fileType="header">/usr/include</Path>
-                <Path fileType="library">/usr/lib/pkgconfig</Path>
-            </Files>
-        </Package>
-        <History>
-            <Update release="1">
-                <Date>2024-04-18</Date>
-                <Version>2.0.0</Version>
-                <Comment>First release</Comment>
-                <Name>Mustafa Cinasal</Name>
-                <Email>muscnsl@gmail.com</Email>
-            </Update>
-        </History>
-    </SpecFile>
     <SpecFile>
         <Source>
             <Name>colord-gtk</Name>
@@ -342943,6 +342899,69 @@ components such as the Settings and gnome-shell.</Description>
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>qtermwidget6</Name>
+            <Homepage>https://github.com/lxqt/qtermwidget</Homepage>
+            <Packager>
+                <Name>Ayhan Yalçınsoy</Name>
+                <Email>ayhanyalcinsoy@pisilinux.org</Email>
+            </Packager>
+            <License>GPLv2</License>
+            <IsA>library</IsA>
+            <IsA>app:gui</IsA>
+            <PartOf>desktop.toolkit</PartOf>
+            <Summary xml:lang="en">Terminal widget for Qt5</Summary>
+            <Description xml:lang="en">A simple terminal widget for using with Qt5 based applications</Description>
+            <Archive type="zip" sha1sum="d45ccbb0c48fb2ef40e109ccab29dabf3d126107" name="7a25783c101f45a8ba1713f98c968b848103f5e3.zip">https://github.com/lxqt/qtermwidget/archive/7a25783c101f45a8ba1713f98c968b848103f5e3.zip</Archive>
+            <BuildDependencies>
+                <Dependency>cmake</Dependency>
+                <Dependency>libgcc</Dependency>
+                <Dependency versionFrom="2.0.0">lxqt-build-tools</Dependency>
+                <Dependency versionFrom="6.6.3">qt6-base-devel</Dependency>
+                <Dependency versionFrom="6.6.3">qt6-linguist</Dependency>
+                <Dependency versionFrom="6.6.3">qt6-5compat-devel</Dependency>
+            </BuildDependencies>
+            <SourceURI>desktop/toolkit/qtermwidget6/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>qtermwidget6</Name>
+            <Summary xml:lang="en">Development files for qtermwidget6</Summary>
+            <RuntimeDependencies>
+                <Dependency>libgcc</Dependency>
+                <Dependency>qt6-base</Dependency>
+                <Dependency>qt6-5compat</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="executable">/usr/bin/consoleq</Path>
+                <Path fileType="library">/usr/lib</Path>
+                <Path fileType="data">/usr/share</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+            </Files>
+        </Package>
+        <Package>
+            <Name>qtermwidget6-devel</Name>
+            <Summary xml:lang="en">Development files for qtermwidget6</Summary>
+            <RuntimeDependencies>
+                <Dependency versionFrom="6.6.3">qt6-base-devel</Dependency>
+                <Dependency release="1">qtermwidget6</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="data">/usr/share/cmake/qtermwidget6</Path>
+                <Path fileType="header">/usr/include</Path>
+                <Path fileType="library">/usr/lib/pkgconfig</Path>
+            </Files>
+        </Package>
+        <History>
+            <Update release="1">
+                <Date>2024-04-18</Date>
+                <Version>2.0.0</Version>
+                <Comment>First release</Comment>
+                <Name>Mustafa Cinasal</Name>
+                <Email>muscnsl@gmail.com</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>qt5-graphicaleffects</Name>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index b2805c9b01..29e6883317 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-ae96c1ab80d75f7f5fd8f4596d7b8fc8ab295bc0
\ No newline at end of file
+459da73bc12f7fa5896ade8025a2e00e2d2bef28
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 877f1109f4..4be8a633f0 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 88200d2deb..42c0594e98 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-237d35b0edfcdeec54243062fc790dae221fb3df
\ No newline at end of file
+4f5df91e32a778e00693257cddea7ab52a4d1424
\ No newline at end of file