diff --git a/.SRCINFO b/.SRCINFO
index 7954a24..5de5fed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
-pkgbase = pamac-flatpak
-	pkgdesc = A Gtk3 frontend for libalpm (with AUR, Flatpak and AppIndicator support)
+pkgbase = pamac-flatpak-gnome
+	pkgdesc = A Gtk3 frontend for libalpm (with AUR, Flatpak, AppIndicator support, and GNOME integration)
 	pkgver = 10.1.3
 	pkgrel = 3
 	url = https://gitlab.manjaro.org/applications/pamac
@@ -30,10 +30,12 @@ pkgbase = pamac-flatpak
 	conflicts = pamac-classic
 	conflicts = pamac-aur
 	conflicts = pamac-aur-git
-    	conflicts = pamac-all
-    	conflicts = pamac-all-git
+	conflicts = pamac-all
+	conflicts = pamac-all-git
+	conflicts = pamac-flatpak
+	conflicts = gnome-software
 	options = !emptydirs
 	source = pamac-10.1.3.tar.gz::https://gitlab.manjaro.org/applications/pamac/-/archive/v10.1.3/pamac-v10.1.3.tar.gz
 	sha256sums = 577c0dfca155af9f4a7537b6c09bd37958ea5b5724c187f03239b27bd3d5951a
 
-pkgname = pamac-flatpak
+pkgname = pamac-flatpak-gnome
diff --git a/PKGBUILD b/PKGBUILD
index 1f324cf..2a2a99d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,25 @@
 # Maintainer: TommyTran732
 # https://gitlab.manjaro.org/packages/extra/pamac
 
-#Set this flag to 0 if you want to use pamac-tray-icon-plasma
-ENABLE_APPINDICATOR=1
-
 pkgname=pamac-flatpak
 pkgver=10.1.3
 pkgrel=3
 _pkgfixver=$pkgver
 
-pkgdesc="A Gtk3 frontend for libalpm (with AUR, Flatpak and AppIndicator support)"
+pkgdesc="A Gtk3 frontend for libalpm (with AUR, Flatpak, AppIndicator support, and GNOME integration)"
 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64')
 url="https://gitlab.manjaro.org/applications/pamac"
 license=('GPL3')
-depends=('libnotify' 'libpamac-flatpak' 'libhandy')
+depends=('libnotify' 'libpamac-flatpak' 'libhandy' 'libappindicator-gtk3')
 optdepends=('polkit-gnome: needed for authentification in Cinnamon, Gnome')
 makedepends=('gettext' 'itstool' 'vala>=0.45' 'meson' 'ninja' 'gobject-introspection' 'xorgproto' 'asciidoc')
-conflicts=('pamac' 'pamac-cli' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak-gnome')
-provides=('pamac')
+conflicts=('pamac' 'pamac-cli' 'pamac-classic' 'pamac-aur' 'pamac-aur-git' 'pamac-all' 'pamac-all-git' 'pamac-flatpak' 'gnome-software')
+provides=('pamac' 'gnome-software')
 options=(!emptydirs)
 install=pamac.install
 source=("pamac-$pkgver.tar.gz::$url/-/archive/v$pkgver/pamac-v$pkgver.tar.gz") 
 sha256sums=('577c0dfca155af9f4a7537b6c09bd37958ea5b5724c187f03239b27bd3d5951a')
 
-if [ "${ENABLE_APPINDICATOR}" = 1 ]; then
-  depends+=('libappindicator-gtk3')
-  define_meson+=' -Denable-appindicator=true'
-fi
-
 prepare() {
   cd "$srcdir/pamac-v$pkgver"
   # adjust version string
@@ -38,7 +30,7 @@ build() {
   cd "$srcdir/pamac-v$pkgver"
   mkdir -p builddir
   cd builddir
-  meson --prefix=/usr --sysconfdir=/etc -Denable-flatpak=true $define_meson --buildtype=release
+  meson --prefix=/usr --sysconfdir=/etc -Denable-flatpak=true -Denable-appindicator=true -Denable-fake-gnome-software=true --buildtype=release
   ninja
 }
 
diff --git a/README.md b/README.md
index c70efc4..87b09b2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 A Gtk3 frontend for libalpm (with AUR, Flatpak and AppIndicator support)
 
 # Attribution
-This package is a modified version of [pamac-all](https://aur.archlinux.org/packages/pamac-all) with Snapd removed. <br >
+This package is a modified version of [pamac-all](https://aur.archlinux.org/packages/pamac-all) with Snapd removed and added GNOME integration. <br >
 
 # Notes
 The Flathub Beta repository is enable by default. <br >
diff --git a/pamac.install b/pamac.install
index 4912c8e..66700a2 100644
--- a/pamac.install
+++ b/pamac.install
@@ -2,7 +2,7 @@ post_install() {
    # enable flatpak repo
   if [ -f /usr/bin/flatpak ]; then
     flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    flatpak remote-add --if-not-exists flathub-beta https://flathub.org/repo-beta/flathub-beta.flatpakrepo
+    flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
   fi   
   # enable systemd timers
   ln -sf /usr/lib/systemd/system/pamac-cleancache.timer /etc/systemd/system/multi-user.target.wants