diff --git a/desktop/gnome/apps/epiphany/actions.py b/desktop/gnome/apps/epiphany/actions.py
index 85c4cc1c2a..a49feb84ce 100644
--- a/desktop/gnome/apps/epiphany/actions.py
+++ b/desktop/gnome/apps/epiphany/actions.py
@@ -6,7 +6,6 @@
 
 from pisi.actionsapi import mesontools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
 
 def setup():
     mesontools.configure("-Dunit_tests=disabled")
diff --git a/desktop/gnome/apps/epiphany/pspec.xml b/desktop/gnome/apps/epiphany/pspec.xml
index 055c05629c..8256965f10 100644
--- a/desktop/gnome/apps/epiphany/pspec.xml
+++ b/desktop/gnome/apps/epiphany/pspec.xml
@@ -37,7 +37,7 @@
             <Dependency>gmp-devel</Dependency>
             <Dependency>meson</Dependency>
         </BuildDependencies>
-        <Archive sha1sum="f56d32e29bf46f9e714e009389a06c320d01d130" type="tarxz">https://download.gnome.org/sources/epiphany/3.38/epiphany-3.38.5.tar.xz</Archive>
+        <Archive sha1sum="9aee7db3a159255d003fc5f9982abe4338c6cfdb" type="tarxz">https://download.gnome.org/sources/epiphany/40/epiphany-40.2.tar.xz</Archive>
     </Source>
 
     <Package>
@@ -61,6 +61,7 @@
             <Dependency>webkit2gtk</Dependency>
             <Dependency>libhandy</Dependency>
             <Dependency>libportal</Dependency>
+            <Dependency>libarchive</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -81,6 +82,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2021-06-08</Date>
+            <Version>40.2</Version>
+            <Comment>Version bump</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2021-06-07</Date>
             <Version>3.38.5</Version>
diff --git a/desktop/gnome/base/gdm/actions.py b/desktop/gnome/base/gdm/actions.py
index 66440430d2..acab166ba3 100644
--- a/desktop/gnome/base/gdm/actions.py
+++ b/desktop/gnome/base/gdm/actions.py
@@ -11,6 +11,7 @@ from pisi.actionsapi import shelltools
 def setup():
     shelltools.system("sed -i 's@systemd@elogind@' data/pam-lfs/gdm-launch-environment.pam")
     shelltools.system("sed -i 's@-session@session @' data/pam-lfs/gdm-launch-environment.pam")
+    shelltools.system("sed -i 's@uid >= 1000@uid >= 0@g' data/pam-lfs/*.pam")
 
     mesontools.configure("--prefix=/usr \
                           --localstatedir=/var \
diff --git a/desktop/gnome/base/gdm/comar/service.py b/desktop/gnome/base/gdm/comar/service.py
index 679c6940b1..6b1d811449 100644
--- a/desktop/gnome/base/gdm/comar/service.py
+++ b/desktop/gnome/base/gdm/comar/service.py
@@ -10,7 +10,7 @@ serviceDesc = _({
     "tr": "GNOME Masaüstü",
 })
 serviceDefault="on"
-PIDFILE="/var/run/gdm/gdm.pid"
+PIDFILE="/run/gdm/gdm.pid"
 DAEMON="/usr/sbin/gdm"
 
 @synchronized
diff --git a/desktop/gnome/base/gdm/pspec.xml b/desktop/gnome/base/gdm/pspec.xml
index 53b06d3546..097f61fb74 100644
--- a/desktop/gnome/base/gdm/pspec.xml
+++ b/desktop/gnome/base/gdm/pspec.xml
@@ -106,6 +106,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2021-06-09</Date>
+            <Version>40.0</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2021-06-05</Date>
             <Version>40.0</Version>
diff --git a/desktop/lookandfeel/pisilinux-gnome40-backgrounds/actions.py b/desktop/lookandfeel/pisilinux-gnome40-backgrounds/actions.py
new file mode 100644
index 0000000000..7f046fa27c
--- /dev/null
+++ b/desktop/lookandfeel/pisilinux-gnome40-backgrounds/actions.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env 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 autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
+
+#def setup():
+    #autotools.configure()
+
+def build():
+    autotools.make()
+
+def install():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
diff --git a/desktop/lookandfeel/pisilinux-gnome40-backgrounds/pspec.xml b/desktop/lookandfeel/pisilinux-gnome40-backgrounds/pspec.xml
new file mode 100644
index 0000000000..b292b0e81d
--- /dev/null
+++ b/desktop/lookandfeel/pisilinux-gnome40-backgrounds/pspec.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>pisilinux-gnome40-backgrounds</Name>
+        <Homepage>http://www.pisilinux.org/</Homepage>
+        <Packager>
+            <Name>Pisi Linux Admins</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>CC0</License>
+        <Summary>Default wallpaper set for Pisi Linux GNOME40.</Summary>
+        <Description>Default wallpaper set for Pisi Linux GNOME40.</Description>
+        <Archive sha1sum="5a03d509a13e0c5d7acb211e5ac71132653d4d09" type="targz">https://sourceforge.net/projects/pisilinux/files/source/pisilinux-gnome40-backgrounds.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>pisilinux-gnome40-backgrounds</Name>
+        <Files>
+            <Path fileType="data">/usr/share/backgrounds</Path>
+            <Path fileType="doc">/usr/share/gnome-background-properties</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>2021-06-10</Date>
+            <Version>1.0.0</Version>
+            <Comment>First release for Pisi Linux</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/hardware/virtualization/flatpak/actions.py b/hardware/virtualization/flatpak/actions.py
index cbf91f2609..09ab45af85 100644
--- a/hardware/virtualization/flatpak/actions.py
+++ b/hardware/virtualization/flatpak/actions.py
@@ -12,14 +12,12 @@ from pisi.actionsapi import get
 
 def setup():
     shelltools.system("NOCONFIGURE=1 ./autogen.sh")
-    autotools.configure(" --enable-selinux-module=no \
-                          --with-system-bubblewrap \
-                          --disable-static \
-                          --with-priv-mode=setuid \
-                          --with-profile-dir=/etc/profile.d \
-                          --with-dbus-config-dir=/usr/share/dbus-1/system.d \
-                          --disable-nls")
-    
+    autotools.configure("--enable-selinux-module=no \
+                         --with-system-bubblewrap \
+                         --with-priv-mode=none \
+                         --with-system-dbus-proxy \
+                         --without-systemd")
+
     pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
@@ -27,6 +25,7 @@ def build():
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    # shelltools.system('install -d -o root -g 102 -m 750 "%s/usr/share/polkit-1/rules.d"' % get.installDIR())
 
     pisitools.removeDir("/usr/lib/systemd")
 
diff --git a/hardware/virtualization/flatpak/comar/package.py b/hardware/virtualization/flatpak/comar/package.py
index 16a5245b69..372681c8c5 100644
--- a/hardware/virtualization/flatpak/comar/package.py
+++ b/hardware/virtualization/flatpak/comar/package.py
@@ -1,18 +1,25 @@
 #!/usr/bin/python
+#
+# Currently, as in some other LFS based distros, providing an user account for flatpak breaks
+# the FUSE and non-sudo installations.
+# However, I am leaving this file in the repo just in case.
 
 import os, re
 
+OUR_NAME = "flatpak"
+OUR_DESC = "flatpak"
+
 def postInstall(fromVersion, fromRelease, toVersion, toRelease):
     try:
-        os.system("getent group flatpak || /usr/sbin/groupadd -g 93 flatpak")
-        os.system("getent passwd flatpak || /usr/sbin/useradd -g flatpak -u 93 -d /var/empty -s /bin/false -c 'flatpak User' flatpak")
-        os.system("/usr/bin/passwd -l flatpak")
+        os.system("groupadd -r %s" % OUR_NAME)
+        os.system("useradd -r -g %s -d / -s /bin/false -c %s %s" % (OUR_NAME, OUR_DESC, OUR_NAME))
+
     except:
         pass
 
-def preRemove():
+def postRemove():
     try:
-        os.system("userdel flatpak")
-        os.system("groupdel flatpak")
+        os.system("userdel %s" % OUR_NAME)
+        os.system("groupdel %s" % OUR_NAME)
     except:
         pass
diff --git a/hardware/virtualization/flatpak/files/flatpak-bindir.sh b/hardware/virtualization/flatpak/files/flatpak-bindir.sh
index a9c6332cab..7ad7b0a6a6 100644
--- a/hardware/virtualization/flatpak/files/flatpak-bindir.sh
+++ b/hardware/virtualization/flatpak/files/flatpak-bindir.sh
@@ -1,7 +1,9 @@
-if [ -d "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
-  PATH="$PATH:$HOME/.local/share/flatpak/exports/bin"
+if [ -n "$XDG_DATA_HOME" ] && [ -d "$XDG_DATA_HOME/flatpak/exports/bin" ]; then
+  append_path "$XDG_DATA_HOME/flatpak/exports/bin"
+elif [ -n "$HOME" ] && [ -d "$HOME/.local/share/flatpak/exports/bin" ]; then
+  append_path "$HOME/.local/share/flatpak/exports/bin"
 fi
 
 if [ -d /var/lib/flatpak/exports/bin ]; then
-  PATH="$PATH:/var/lib/flatpak/exports/bin"
-fi
+  append_path /var/lib/flatpak/exports/bin
+fi
\ No newline at end of file
diff --git a/hardware/virtualization/flatpak/pspec.xml b/hardware/virtualization/flatpak/pspec.xml
index c366886f3d..cb3357ec5d 100644
--- a/hardware/virtualization/flatpak/pspec.xml
+++ b/hardware/virtualization/flatpak/pspec.xml
@@ -8,10 +8,10 @@
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
         </Packager>
-        <License>LGPLv2</License>
+        <License>LGPLv2.1</License>
         <Summary>Application distribution framework</Summary>
         <Description>Linux application sandboxing and distribution framework, formerly xdg-app</Description>
-        <Archive sha1sum="1cd25f8577ba55d1370652e9bd24e8a2d254143a" type="tarxz">https://github.com/flatpak/flatpak/releases/download/1.10.2/flatpak-1.10.2.tar.xz</Archive>
+        <Archive sha1sum="2f3af33693b03c6fc981155f6d7cecd8590be752" type="tarxz">https://github.com/flatpak/flatpak/releases/download/1.11.1/flatpak-1.11.1.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>xmlto</Dependency>
             <Dependency>util-linux</Dependency>
@@ -28,6 +28,8 @@
             <Dependency>python-six</Dependency>
             <Dependency versionFrom="2019.2">ostree-devel</Dependency>
             <Dependency>python3-pyparsing</Dependency>
+            <Dependency>xdg-dbus-proxy</Dependency>
+            <Dependency>elogind-devel</Dependency>
         </BuildDependencies>
         <Patches>
             <!--Patch level="1">bubblewrap_libglnx_submodule.patch</Patch-->
@@ -56,13 +58,15 @@
             <Dependency>polkit</Dependency>
             <Dependency>appstream-glib</Dependency>
             <Dependency>python3-pyparsing</Dependency>
+            <Dependency>libassuan</Dependency>
+            <Dependency>libgpg-error</Dependency>
+            <Dependency>xdg-dbus-proxy</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="config">/etc</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="library">/usr/libexec</Path>
-            <Path fileType="library">/usr/share/gir-1.0</Path>
             <Path fileType="data">/usr/share/bash-completion</Path>
             <Path fileType="data">/usr/share/fish/vendor_completions.d/</Path>
             <Path fileType="data">/usr/share/dbus-1</Path>
@@ -72,15 +76,14 @@
             <Path fileType="locale">/usr/share/locale</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="doc">/usr/share/gtk-doc</Path>
-            <Path fileType="data">/usr/share/gdm</Path>
             <Path fileType="doc">/usr/share/zsh</Path>
         </Files>
         <AdditionalFiles>
-            <AdditionalFile target="/etc/profile.d/flatpak-bindir.sh" permission="0644" owner="root">flatpak-bindir.sh</AdditionalFile>
-            <AdditionalFile target="/usr/share/flatpak/flathub.flatpakrepo" permission="0644" owner="root">flathub.flatpakrepo</AdditionalFile>
+            <!--AdditionalFile target="/etc/profile.d/flatpak-bindir.sh" permission="0644" owner="root">flatpak-bindir.sh</AdditionalFile-->
+            <AdditionalFile target="/etc/flatpak/remotes.d/flathub.flatpakrepo" permission="0644" owner="root">flathub.flatpakrepo</AdditionalFile>
         </AdditionalFiles>
         <Provides>
-            <COMAR script="package.py">System.Package</COMAR>
+            <!--COMAR script="package.py">System.Package</COMAR-->
         </Provides>
     </Package>
 
@@ -89,26 +92,24 @@
         <Summary>Development files for flatpak</Summary>
         <RuntimeDependencies>
             <Dependency release="current">flatpak</Dependency>
-            <Dependency>fuse-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
-            <Dependency>gpgme-devel</Dependency>
-            <Dependency>libXau-devel</Dependency>
-            <Dependency>libxml2-devel</Dependency>
-            <Dependency>libsoup-devel</Dependency>
-            <Dependency>json-glib-devel</Dependency>
-            <Dependency>libarchive-devel</Dependency>
-            <Dependency>libseccomp-devel</Dependency>
             <Dependency>ostree-devel</Dependency>
-            <Dependency>polkit-devel</Dependency>
-            <Dependency>appstream-glib-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="data">/usr/share/gir-1.0</Path>
         </Files>
     </Package>
 
     <History>
+        <Update release="14">
+            <Date>2021-06-07</Date>
+            <Version>1.11.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
         <Update release="13">
             <Date>2021-04-29</Date>
             <Version>1.10.2</Version>