diff --git a/x11-misc/betterlockscreen/betterlockscreen-3.0.1.ebuild b/x11-misc/betterlockscreen/betterlockscreen-3.0.1.ebuild
index d264d7d574..1f008cf2fc 100644
--- a/x11-misc/betterlockscreen/betterlockscreen-3.0.1.ebuild
+++ b/x11-misc/betterlockscreen/betterlockscreen-3.0.1.ebuild
@@ -6,12 +6,14 @@ EAPI=7
 DESCRIPTION="sweet looking lockscreen for linux system"
 HOMEPAGE="https://github.com/pavanjadhaw/betterlockscreen"
 
-if [[ ${PV} == 9999 ]];then
-	inherit git-r3 systemd
+inherit systemd
+
+if [[ "${PV}" == 9999 ]];then
+	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}"
+	KEYWORDS=""
 else
-	inherit systemd
-	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/pavanjadhaw/betterlockscreen/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -19,21 +21,21 @@ LICENSE="MIT"
 SLOT="0"
 
 DEPEND="
-	>=x11-misc/i3lock-color-2.11:=
+	media-gfx/feh
 	media-gfx/imagemagick
+	sys-devel/bc
 	x11-apps/xdpyinfo
 	x11-apps/xrandr
-	sys-devel/bc
-	media-gfx/feh
+	>=x11-misc/i3lock-color-2.11:=
 "
 RDEPEND="${DEPEND}"
 
-src_install(){
+src_install() {
 	dobin betterlockscreen
 
 	dodoc -r examples
 
-	if [[ $PV == 9999 ]] ; then
+	if [[ "${PV}" == 9999 ]] ; then
 		systemd_dounit system/betterlockscreen@.service
 	else
 		systemd_dounit betterlockscreen@.service
diff --git a/x11-misc/betterlockscreen/betterlockscreen-9999.ebuild b/x11-misc/betterlockscreen/betterlockscreen-9999.ebuild
index d264d7d574..1f008cf2fc 100644
--- a/x11-misc/betterlockscreen/betterlockscreen-9999.ebuild
+++ b/x11-misc/betterlockscreen/betterlockscreen-9999.ebuild
@@ -6,12 +6,14 @@ EAPI=7
 DESCRIPTION="sweet looking lockscreen for linux system"
 HOMEPAGE="https://github.com/pavanjadhaw/betterlockscreen"
 
-if [[ ${PV} == 9999 ]];then
-	inherit git-r3 systemd
+inherit systemd
+
+if [[ "${PV}" == 9999 ]];then
+	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}"
+	KEYWORDS=""
 else
-	inherit systemd
-	SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/pavanjadhaw/betterlockscreen/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
 fi
 
@@ -19,21 +21,21 @@ LICENSE="MIT"
 SLOT="0"
 
 DEPEND="
-	>=x11-misc/i3lock-color-2.11:=
+	media-gfx/feh
 	media-gfx/imagemagick
+	sys-devel/bc
 	x11-apps/xdpyinfo
 	x11-apps/xrandr
-	sys-devel/bc
-	media-gfx/feh
+	>=x11-misc/i3lock-color-2.11:=
 "
 RDEPEND="${DEPEND}"
 
-src_install(){
+src_install() {
 	dobin betterlockscreen
 
 	dodoc -r examples
 
-	if [[ $PV == 9999 ]] ; then
+	if [[ "${PV}" == 9999 ]] ; then
 		systemd_dounit system/betterlockscreen@.service
 	else
 		systemd_dounit betterlockscreen@.service