diff --git a/lxde/base/gpicview/ympbuild b/lxde/base/gpicview/ympbuild
new file mode 100644
index 00000000..f32d3c54
--- /dev/null
+++ b/lxde/base/gpicview/ympbuild
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+name='gpicview'
+release='2'
+version='0.3.1'
+url='https://www.lxde.org'
+description='Lightweight image viewer'
+email='akarsu@protonmail.com'
+maintainer='akarsu'
+license=('GPL2')
+source=("https://github.com/lxde/gpicview/archive/refs/tags/$version.tar.gz")
+depends=(gtk3)
+makedepends=(intltool)
+sha256sums=('b65dd991368ed2b08645a50cb6d4831e21e3c0d0f7d72394d40105ddba754533')
+group=(lxde.base)
+uses=()
+arch=('x86_64')
+
+cd $name-$version
+
+prepare() {
+    # Apply only one main category
+    sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
+}
+setup(){
+    autoreconf -fvi
+    ./configure --prefix=/usr \
+        --libdir=/usr/lib64/ \
+        --enable-gtk3
+}
+
+build(){
+    make $jobs
+}
+
+package(){
+    make DESTDIR="$DESTDIR" install
+}
+
diff --git a/lxde/base/lxappearance/ympbuild b/lxde/base/lxappearance/ympbuild
index 7dccf57a..6cb696ee 100644
--- a/lxde/base/lxappearance/ympbuild
+++ b/lxde/base/lxappearance/ympbuild
@@ -1,33 +1,32 @@
 #!/usr/bin/env bash
 name='lxappearance'
-release='1'
-version='0.6.3'
+release='2'
+version='0.6.4'
 url='Feature-rich GTK+ theme switcher of the LXDE Desktop'
 description='Feature-rich GTK+ theme switcher of the LXDE Desktop'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('GPL2')
-source=("https://downloads.sourceforge.net/lxde/$name-$version.tar.xz"
+source=("https://github.com/lxde/lxappearance/archive/refs/tags/$version.tar.gz"
        "00-gtk3-fix.patch")
 depends=(gtk3 dbus-glib)
 makedepends=(intltool)
-sha256sums=('7222d858b8fef4b7967c42142d61e82ded6dd42dc5ef1d59caad775795928b38'
+sha256sums=('9f067a8a126b9779ba12648c76136d9ba3e7ec7920c568df7819d128fdf39e03'
          'SKIP')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+export CC=clang
 cd $name-$version
 
-prepare(){
-    patch -Np1 -i ../00-gtk3-fix.patch
-}
 
 setup(){
+    autoreconf -fvi
     ./configure --prefix=/usr --enable-gtk3 \
         --libdir=/usr/lib64/ \
         --enable-dbus
-        
+
 }
 
 build(){
diff --git a/lxde/base/lxde-common/ympbuild b/lxde/base/lxde-common/ympbuild
index 8916befc..4aaa36ad 100644
--- a/lxde/base/lxde-common/ympbuild
+++ b/lxde/base/lxde-common/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='lxde-common'
-release='1'
-version='0.99.2'
+release='2'
+version='0.99.3'
 url='https://github.com/lxde/lxde-common'
 description='LXDE Session default configuration files and nuoveXT2 iconset '
 email='bayramk@gmail.com'
@@ -10,13 +10,15 @@ license=('GPLv3')
 source=("https://github.com/lxde/lxde-common/archive/refs/tags/$version.tar.gz")
 depends=()
 makedepends=()
-sha256sums=('f62a0a02bfa0837a91916f66336228520d54040674590d4b6dd5ad2efc4e92fd')
+sha256sums=('e55ac4b4406f7538ed5994677c6488c6a0dd9a4b34a0969402aaa4f04b52b26f')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
 cd $name-$version
 
+export CC=clang
+
 setup(){
 	autoreconf -fvi
     ./configure --prefix=/usr \
diff --git a/lxde/base/lxde-icon-theme/ympbuild b/lxde/base/lxde-icon-theme/ympbuild
index fe59895e..cb02303e 100644
--- a/lxde/base/lxde-icon-theme/ympbuild
+++ b/lxde/base/lxde-icon-theme/ympbuild
@@ -1,23 +1,27 @@
 #!/usr/bin/env bash
 name='lxde-icon-theme'
-release='1'
-version='0.5.1'
+release='2'
+version='0.5.2'
 url='https://lxde.org'
 description='LXDE default icon theme based on nuoveXT2'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('GPL')
-source=("https://downloads.sourceforge.net/lxde/lxde-icon-theme-$version.tar.xz")
+source=("https://github.com/lxde/lxde-icon-theme/archive/refs/tags/$version.tar.gz")
 depends=()
 makedepends=(intltool)
-sha256sums=('e3d0b7399f28a360a3755171c9a08147d68f853f518be5485f5064675037916c')
+sha256sums=('5b71da247ba25ddcd991a3a184ca5ac92f40b7676766e1e59437067a20f7ecf7')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+
+export CC=clang
+
 cd $name-$version
 
 setup(){
+    autoreconf -fvi
     ./configure --prefix=/usr \
         --libdir=/usr/lib64/
 }
diff --git a/lxde/base/lxhotkey/ympbuild b/lxde/base/lxhotkey/ympbuild
index ec61aa1b..030f04f9 100644
--- a/lxde/base/lxhotkey/ympbuild
+++ b/lxde/base/lxhotkey/ympbuild
@@ -1,20 +1,22 @@
 #!/usr/bin/env bash
 name='lxhotkey'
-release='1'
-version='0.1.1'
+release='2'
+version='0.1.2'
 url='https://github.com/lxde/lxhotkey/'
 description='LXDE hotkey'
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
 source=("https://github.com/lxde/lxhotkey/archive/refs/tags/$version.tar.gz")
-depends=(libfm)
+depends=(libfm libexif)
 makedepends=()
-sha256sums=('c5a9fa01960c1d0d92b1fb6392bc73db7793c7f889ca716c41a46a434bcfff57')
+sha256sums=('f32686d298d86ae1e97c9e3d27ba1f01b6a0f17dbbbbd67dfbf82e7c0080c592')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+export CC=clang
+
 cd $name-$version
 
 setup(){
diff --git a/lxde/base/lxinput/ympbuild b/lxde/base/lxinput/ympbuild
index c835b62d..524fe0ec 100644
--- a/lxde/base/lxinput/ympbuild
+++ b/lxde/base/lxinput/ympbuild
@@ -1,26 +1,28 @@
 #!/usr/bin/env bash
 name='lxinput'
-release='1'
-version='0.3.5'
+release='2'
+version='0.3.6'
 url='https://github.com/lxde/lxinput'
 description='LXDE keyboard and mouse configuration tool '
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=("https://salsa.debian.org/lxde-team/lxinput/-/archive/debian/$version-1/lxinput-debian-$version-1.tar.gz")
+source=("https://github.com/lxde/lxinput/archive/refs/tags/$version.tar.gz")
 depends=(gtk3)
 makedepends=()
-sha256sums=('b78baa9af84ca671b1e2b16387f4d6e452860a1803203fa844f35b93ec97c054')
+sha256sums=('2f15c2a17f970afb152cbd024503da26c1e15135e76e9f516e0ca97e909d6c37')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
-cd $name-debian-$version-1
+export CC=clang
+
+cd $name-$version
 
 setup(){
 	autoreconf -fvi
     ./configure --prefix=/usr \
-        --libdir=/usr/lib64/ --enable-gtk3 
+        --libdir=/usr/lib64/ --enable-gtk3
 }
 
 build(){
diff --git a/lxde/base/lxlauncher/ympbuild b/lxde/base/lxlauncher/ympbuild
index f9c9dbb1..37af18f3 100644
--- a/lxde/base/lxlauncher/ympbuild
+++ b/lxde/base/lxlauncher/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='lxlauncher'
-release='1'
-version='0.2.5'
+release='2'
+version='0.2.8'
 url='https://wiki.lxde.org/en/LXLauncher'
 description='Open source clone of the Asus launcher for EeePC'
 email='bayramk@gmail.com'
@@ -10,11 +10,13 @@ license=('GPLv3')
 source=("https://github.com/lxde/lxlauncher/archive/refs/tags/$version.tar.gz")
 depends=(startup-notification gtk3 menu-cache)
 makedepends=()
-sha256sums=('532f1ea27f41311133eb8cb4dcc9bba373150b09ded5a9cddc9ff7360bb86984')
+sha256sums=('f67d9dbf3a130819fd171b621b3683d7d20cd609554756481b965484ac591b49')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+export CC=clang
+
 cd $name-$version
 
 setup(){
diff --git a/lxde/base/lxmenu-data/ympbuild b/lxde/base/lxmenu-data/ympbuild
index b8fd9d56..e9500889 100644
--- a/lxde/base/lxmenu-data/ympbuild
+++ b/lxde/base/lxmenu-data/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='lxmenu-data'
-release='1'
-version='0.1.5'
+release='2'
+version='0.1.6'
 url='https://github.com/lxde/lxmenu-data'
 description='Provides files needed for LXDE application menus '
 email='bayramk@gmail.com'
@@ -10,11 +10,13 @@ license=('GPLv3')
 source=("https://github.com/lxde/lxmenu-data/archive/refs/tags/$version.tar.gz")
 depends=()
 makedepends=()
-sha256sums=('e2417923d16ac1dfce27ec7416d88fbafff5023eeb1f47fa481062cb1d93c855')
+sha256sums=('b237e732609fb2a521a942e08bb825ac7973ee478db7567d3606665a3793b2e8')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+export CC=clang
+
 cd $name-$version
 
 setup(){
diff --git a/lxde/base/lxpanel/ympbuild b/lxde/base/lxpanel/ympbuild
index bca5e164..85fca55e 100644
--- a/lxde/base/lxpanel/ympbuild
+++ b/lxde/base/lxpanel/ympbuild
@@ -1,30 +1,33 @@
 #!/usr/bin/env bash
 name='lxpanel'
-release='1'
-version='0.10.1'
+release='2'
+version='0.11.0'
 url='https://wiki.lxde.org/en/LXPanel'
 description='Lightweight X11 desktop panel for LXDE '
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=("https://salsa.debian.org/lxde-team/lxpanel/-/archive/debian/$version-1/lxpanel-debian-$version-1.tar.gz"
+source=("https://github.com/lxde/lxpanel/archive/refs/tags/$version.tar.gz"
         "lxpanel-0.10.1-c99.patch")
-depends=(libwnck3 wireless-tools)
+depends=(libwnck3 wireless-tools libkeybinder3 alsa-lib curl libX11 libfm libxml2)
 makedepends=()
-sha256sums=('e4c6a8c9901f4226160af79c409236fe4e5d1b1ec3aefdb1c43e416698f27811'
+sha256sums=('3a681a0902684457c6c1f7ff7fd1b6c7c16883fba1822e248347f992cf3f9ce2'
             'SKIP')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
-cd $name-debian-$version-1
+cd $name-$version
 
+export CC=clang
 export CFLAGS="-Wno-all -O2 -s"
 export CXXFLAGS="-Wno-all -O2 -s"
 
+
+CFLAGS="$CFLAGS -I/usr/include/libwnck-3.0"
+
 prepare(){
 
-    patch -Np1 -i ../lxpanel-0.10.1-c99.patch
     # Disable pager plugin as it breaks panel layout with GTK+ 3
     # https://sourceforge.net/p/lxde/bugs/773/
     sed -i '/pager.c/d' plugins/Makefile.am
diff --git a/lxde/base/lxrandr/ympbuild b/lxde/base/lxrandr/ympbuild
index f84b289b..815f2bb0 100644
--- a/lxde/base/lxrandr/ympbuild
+++ b/lxde/base/lxrandr/ympbuild
@@ -1,20 +1,22 @@
 #!/usr/bin/env bash
 name='lxrandr'
-release='1'
-version='0.3.2'
+release='2'
+version='0.3.3'
 url='https://lxde.org'
 description='Monitor configuration tool (part of LXDE)'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('GPLv3')
-source=("https://downloads.sourceforge.net/lxde/lxrandr-$version.tar.xz")
+source=("https://github.com/lxde/lxrandr/archive/refs/tags/$version.tar.gz")
 depends=(gtk3 xrandr)
 makedepends=(intltool)
-sha256sums=('8b5edfc9718061bc161fe51d388697cbaa819d6f8013ed24ba22f438e0dbc312')
+sha256sums=('24d0abaee830b0b2973ba9d2e46b3c801445342f7d5d3297c021a8a4a471f512')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+export CC=clang
+
 cd $name-$version
 
 setup(){
diff --git a/lxde/base/lxsession/ympbuild b/lxde/base/lxsession/ympbuild
index 325baef1..aa3d4d3e 100644
--- a/lxde/base/lxsession/ympbuild
+++ b/lxde/base/lxsession/ympbuild
@@ -1,22 +1,21 @@
 #!/usr/bin/env bash
 name='lxsession'
-release='1'
-version='0.5.5'
+release='2'
+version='0.5.6'
 url='https://lxde.org'
 description='Lightweight X11 session manager'
 email='akarsu@protonmail.com'
 maintainer='akarsu'
 license=('GPL2')
-_commit="95e902d76758e09f9226abd39163aadd5cd50bc1"
-source=("https://github.com/lxde/lxsession/archive/${_commit}.zip")
-depends=(gtk3 polkit)
+source=("https://github.com/lxde/lxsession/archive/refs/tags/$version.tar.gz")
+depends=(gtk3 polkit glib libX11 libX11)
 makedepends=(intltool vala docbook-xsl)
-sha256sums=('19df9abfda70fb051c4e0f6d17a68d6e635728065faee7b95e441e26af4098d9')
+sha256sums=('af469d7ed6edbd733da6ad01a46fef3eff871483db5b3d8ecc3c856dbcbed12f')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
-cd $name-${_commit}
+cd $name-$version
 
 export CC="clang"
 export CXX="clang++"
diff --git a/lxde/base/lxtask/ympbuild b/lxde/base/lxtask/ympbuild
index a542024c..d7f8543a 100644
--- a/lxde/base/lxtask/ympbuild
+++ b/lxde/base/lxtask/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='lxtask'
-release='1'
-version='0.1.10'
+release='2'
+version='0.1.12'
 url='https://wiki.lxde.org/en/LXTask'
 description='LXDE Task manager'
 email='bayramk@gmail.com'
@@ -10,11 +10,13 @@ license=('GPLv3')
 source=("https://github.com/lxde/lxtask/archive/refs/tags/$version.tar.gz")
 depends=(gtk3)
 makedepends=()
-sha256sums=('a3ea7f983396d816d8057eea8974e3cc12a870e658f71e15dec41c863e50f5d9')
+sha256sums=('f9d97ebdd8402fe7d9533b6173d0f553d5f9987f5c2885f7d2ee070e80300ab3')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
+export CC=clang
+
 cd $name-$version
 
 setup(){
diff --git a/lxde/base/lxterminal/ympbuild b/lxde/base/lxterminal/ympbuild
index a8d306f6..42e27010 100644
--- a/lxde/base/lxterminal/ympbuild
+++ b/lxde/base/lxterminal/ympbuild
@@ -1,21 +1,21 @@
 #!/usr/bin/env bash
 name='lxterminal'
-release='1'
-version='0.4.0'
+release='2'
+version='0.4.1'
 url='https://wiki.lxde.org/en/LXTerminal'
 description='Lightweight vte-based tabbed terminal emulator for LXDE '
 email='bayramk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=("https://salsa.debian.org/lxde-team/lxterminal/-/archive/debian/$version-2/lxterminal-debian-$version-2.tar.gz")
+source=("https://github.com/lxde/lxterminal/archive/refs/tags/$version.tar.gz")
 depends=(vte3 gtk3 dejavu)
 makedepends=()
-sha256sums=('6635c50801b4f31e75b14d8c1a9782f8a8a72f624abb2d1ed9547010d0c7b1d5')
+sha256sums=('d5da0646e20ad2be44ef69a9d620be5f1ec43b156dc585ebe203dd7b05c31d88')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
-cd $name-debian-$version-2
+cd $name-$version
 
 export CC="clang"
 export CXX="clang++"
diff --git a/lxde/base/menu-cache/ympbuild b/lxde/base/menu-cache/ympbuild
index 8f3ef7b7..6b3b3ba7 100644
--- a/lxde/base/menu-cache/ympbuild
+++ b/lxde/base/menu-cache/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='menu-cache'
-release='1'
-version='1.1.0'
+release='2'
+version='1.1.1'
 url='https://example.org'
 description='Caching mechanism for freedesktop.org compliant menus'
 email='bk@gmail.com'
@@ -11,17 +11,15 @@ source=("https://github.com/lxde/menu-cache/archive/refs/tags/$version.tar.gz"
         'menu-cache-1.1.0-0001-Support-gcc10-compilation.patch')
 depends=(libfm)
 makedepends=()
-sha256sums=('990857aa61a2894730e3749b6bc0f905967eed0c21aa2b62a7694007bdccbe8d'
+sha256sums=('e8af90467df271c3c8700c840ca470ca2915699c6f213c502a87d74608748f08'
          'SKIP')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
 
-cd $name-$version
+export CC=clang
 
-prepare(){
-    patch -Np1 -i ../menu-cache-1.1.0-0001-Support-gcc10-compilation.patch
-}
+cd $name-$version
 
 setup(){
     autoreconf -fvi
diff --git a/lxde/base/pcmanfm/ympbuild b/lxde/base/pcmanfm/ympbuild
index 275bdbfb..37a8931e 100644
--- a/lxde/base/pcmanfm/ympbuild
+++ b/lxde/base/pcmanfm/ympbuild
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 name='pcmanfm'
-release='1'
-version='1.3.2'
+release='2'
+version='1.4.0'
 url='https://github.com/lxde/lxinput'
 description='LXDE keyboard and mouse configuration tool '
 email='bayramk@gmail.com'
@@ -10,7 +10,7 @@ license=('GPLv3')
 source=("https://github.com/lxde/pcmanfm/archive/refs/tags/$version.tar.gz")
 depends=(lxmenu-data libfm menu-cache libkeybinder3)
 makedepends=()
-sha256sums=('66ee6b1a5907bb519d5b175e379f975acfcdaa68b6cbbc72d168b3ff935e6fea')
+sha256sums=('cda4f5ad7e049dcdf3b051b9de4c779adcd55bd720e9c96c45275389aa84264e')
 group=(lxde.base)
 uses=()
 arch=('x86_64')
diff --git a/media/gfx/gpicview/ympbuild b/media/gfx/gpicview/ympbuild
deleted file mode 100644
index 1e24b207..00000000
--- a/media/gfx/gpicview/ympbuild
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-name='gpicview'
-release='1'
-version='0.2.5'
-url='https://www.lxde.org'
-description='Lightweight image viewer'
-email='akarsu@protonmail.com'
-maintainer='akarsu'
-license=('GPL2')
-source=("https://downloads.sourceforge.net/lxde/$name-$version.tar.xz"
-        'https://github.com/archlinux/svntogit-community/blob/packages/gpicview/trunk/gpicview.appdata.xml'
-        'https://github.com/archlinux/svntogit-community/blob/packages/gpicview/trunk/0001-Fix-displaying-images-with-GTK3.patch')
-depends=(gtk3)
-makedepends=(intltool)
-md5sums=('26be9b0c5a234f1afe7d83d02a4a33f4' 'SKIP' 'SKIP')
-group=(media.gfx)
-uses=()
-arch=('x86_64')
-
-cd $name-$version
-
-patch -Np1 -i ../0001-Fix-displaying-images-with-GTK3.patch
-
-# Apply only one main category
-sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
-
-setup(){
-    ./configure --prefix=/usr \
-        --libdir=/usr/lib64/ \
-        --enable-gtk3
-}
-
-build(){
-    make $jobs
-}
-
-package(){
-    make DESTDIR="$DESTDIR" install
-ls -l ../
-    install -Dm644 ../$name.appdata.xml "$DESTDIR/usr/share/metainfo/$name.appdata.xml"
-}
-
diff --git a/x11/libs/libfm/ympbuild b/x11/libs/libfm/ympbuild
index 7b25febc..3cb9861a 100644
--- a/x11/libs/libfm/ympbuild
+++ b/x11/libs/libfm/ympbuild
@@ -1,17 +1,17 @@
 #!/usr/bin/env bash
 name='libfm'
-release='1'
-version='1.3.2'
+release='2'
+version='1.4.0'
 url='https://example.org'
 description='Library for file management'
 email='bk@gmail.com'
 maintainer='bk'
 license=('GPLv3')
-source=('https://github.com/lxde/libfm/archive/refs/tags/1.3.2.tar.gz'
+source=("https://github.com/lxde/libfm/archive/refs/tags/$version.tar.gz"
         'libfm-fixes.patch')
 depends=(gtk3 pango intltool menu-cache)
 makedepends=()
-md5sums=('8b2864ba2d21586171ab9616b5610aeb'
+sha256sums=('7d7b616411992389a4b7f35796109d605f30bc2ceab84d4081d1665254ebbf82'
          'SKIP')
 group=(x11.libs)
 uses=()
@@ -20,9 +20,7 @@ arch=('x86_64')
 
 cd $name-$version
 
-prepare(){
-    patch -Np1 -i ../libfm-fixes.patch
-}
+export CC=clang
 
 setup(){
     autoreconf -fvi