diff --git a/gui-wm/gnome-mobile-meta/gnome-mobile-meta-1.0.ebuild b/gui-wm/gnome-mobile-meta/gnome-mobile-meta-1.0.ebuild
index f231b8b..56099ea 100755
--- a/gui-wm/gnome-mobile-meta/gnome-mobile-meta-1.0.ebuild
+++ b/gui-wm/gnome-mobile-meta/gnome-mobile-meta-1.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=7
 
-DESCRIPTION="Meta package for Phosh without squeekboard"
-HOMEPAGE="https://github.com/dreemurrs-embedded/Pine64-Arch"
+DESCRIPTION="Meta package for Gnome Mobile"
 SRC_URI=""
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~arm64 ~arm"
-IUSE="cawbird squeekboard chromium firefox geary lollypop owncloud nextcloud voicemail accessibility +bluetooth +classic cups python"
+IUSE="cawbird chromium firefox geary lollypop owncloud nextcloud voicemail accessibility +bluetooth +classic cups python"
 DEPEND="
 		>=dev-libs/glib-2.70.2:2
 		>=x11-libs/gdk-pixbuf-2.42.6:2
@@ -104,13 +103,11 @@ DEPEND="
 		sys-auth/rtkit
 		gnome-extra/sushi
 		media-gfx/eog
+		
 		cawbird? (
 			net-im/cawbird
 		)
 		
-		squeekboard? (
-			x11-misc/squeekboard
-		)
 		
 		chromium? (
 			www-client/chromium
diff --git a/gui-wm/phosh/phosh-0.21.1.ebuild b/gui-wm/phosh/phosh-0.21.1.ebuild
new file mode 100755
index 0000000..67969ee
--- /dev/null
+++ b/gui-wm/phosh/phosh-0.21.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop gnome2-utils meson pam readme.gentoo-r1 systemd xdg
+
+MY_P="${PN}-v${PV}"
+LVC_COMMIT="ae1a34aafce7026b8c0f65a43c9192d756fe1057"
+LCU_COMMIT="7e2f9e2db6515fb9c4650010c2a9ecb9796957e3"
+
+DESCRIPTION="A pure Wayland shell prototype for GNOME on mobile devices"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phosh/"
+SRC_URI="
+	https://gitlab.gnome.org/World/Phosh/phosh/-/archive/v${PV}/${MY_P}.tar.gz
+	https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/archive/${LVC_COMMIT}/libgnome-volume-control-${LVC_COMMIT}.tar.gz
+	https://gitlab.gnome.org/World/Phosh/libcall-ui/-/archive/${LCU_COMMIT}/libcall-ui-${LCU_COMMIT}.tar.gz
+"
+S="${WORKDIR}/${MY_P}"
+
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+systemd"
+
+DEPEND="
+	app-crypt/gcr
+	dev-libs/feedbackd
+	media-sound/pulseaudio
+	>=gui-libs/libhandy-1.1.90
+	net-misc/networkmanager
+	gnome-base/gnome-control-center
+	gnome-base/gnome-desktop
+	gnome-base/gnome-session
+	x11-themes/gnome-backgrounds
+	gnome-base/gnome-keyring
+	gnome-base/gnome-shell
+	x11-wm/phoc
+	sys-apps/systemd
+	sys-power/upower
+	app-misc/geoclue
+        net-libs/libnma
+        media-sound/callaudiod
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/ctags
+	dev-util/meson
+"
+
+src_prepare() {
+	default
+	rm -r "${S}"/subprojects/gvc || die
+	mv "${WORKDIR}"/libgnome-volume-control-"${LVC_COMMIT}" "${S}"/subprojects/gvc || die
+	rm -r "${S}"/subprojects/libcall-ui || die
+	mv "${WORKDIR}"/libcall-ui-"${LCU_COMMIT}" "${S}"/subprojects/libcall-ui || die
+	
+	#Polkit patch
+	eapply "${FILESDIR}"/0001-Gentoo-patch-for-polkit-120.patch
+	
+	#Phosh patches
+	eapply "${FILESDIR}"/0001-system-prompt-allow-blank-passwords.patch
+	eapply "${FILESDIR}"/0002-fix-locale-issue.patch
+	eapply "${FILESDIR}"/0003-fix-locale-issue-in-service-file.patch
+
+}
+
+src_configure() {
+	local emesonargs=(	
+	-Dsystemd=true
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	default
+	meson_src_install
+	newpamd "${FILESDIR}"/pam_phosh 'phosh'
+	systemd_newunit "${FILESDIR}"/phosh.service 'phosh.service'
+	domenu "${FILESDIR}"/sm.puri.OSK0.desktop
+
+	DOC_CONTENTS="To amend the existing password policy please see the man 5 passwdqc.conf
+				page and then edit the /etc/security/passwdqc.conf file to change enforce=none
+				to allow use digit only password as phosh only support passcode for now"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/x11-wm/phoc/phoc-0.21.1.ebuild b/x11-wm/phoc/phoc-0.21.1.ebuild
new file mode 100755
index 0000000..68efa33
--- /dev/null
+++ b/x11-wm/phoc/phoc-0.21.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg gnome2-utils
+
+MY_PV="v${PV}"
+MY_P="${PN}-${MY_PV}"
+
+WL_COMMIT="1f8bb9e0e3058fc31a14866dc52e8f83c1287a09"
+WL_P="wlroots-${WL_COMMIT}"
+
+DESCRIPTION="Wlroots based Phone compositor"
+HOMEPAGE="https://gitlab.gnome.org/World/Phosh/phoc"
+
+SRC_URI="
+	https://gitlab.gnome.org/World/Phosh/phoc/-/archive/${MY_PV}/${MY_P}.tar.gz
+	https://source.puri.sm/Librem5/wlroots/-/archive/${WL_COMMIT}/${WL_P}.tar.gz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="+introspection +systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/glib
+	dev-libs/gobject-introspection
+	dev-libs/libinput
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	gnome-base/dconf
+	gnome-base/gsettings-desktop-schemas
+	gnome-base/gnome-settings-daemon
+	gnome-base/gnome-desktop
+	dev-util/vulkan-headers
+	sys-apps/systemd
+	x11-libs/libdrm
+	x11-libs/pixman
+	x11-libs/libxcb
+	x11-libs/xcb-util
+	x11-libs/xcb-util-wm
+	x11-libs/xcb-util-renderutil
+	x11-wm/mutter
+	sys-auth/seatd
+	sys-auth/seatd
+	x11-apps/xkbcomp
+	x11-libs/libdrm	
+	!gui-libs/wlroots
+"
+
+BDEPEND="
+	dev-util/ctags
+	dev-util/meson
+	virtual/pkgconfig
+	x11-base/xorg-server
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	rm -r "${S}"/subprojects/wlroots || die "Failed to remove bundled wlroots"
+	cp -r "${WORKDIR}/${WL_P}" "${S}"/subprojects/wlroots || die "Failed to copy right version of wlroots"
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dembed-wlroots=enabled 
+		-Dtests=false
+	)
+	
+	meson_src_configure
+}
+
+src_install() {
+	DESTDIR="${D}" meson_src_install
+	dobin "${S}"/helpers/scale-to-fit
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}