diff --git a/media-gfx/calculate-wallpapers/calculate-wallpapers-23.ebuild b/media-gfx/calculate-wallpapers/calculate-wallpapers-23.ebuild
index 4a0a3f696..4848941fe 100644
--- a/media-gfx/calculate-wallpapers/calculate-wallpapers-23.ebuild
+++ b/media-gfx/calculate-wallpapers/calculate-wallpapers-23.ebuild
@@ -53,11 +53,11 @@ src_install() {
 	newins "${DISTDIR}"/${PF}.jpg wallpaper.jpg
 
 	insinto /
-	for useflag in $VERSION_IUSE
+	for useflag in ${VERSION_IUSE}
 	do
 		if use $useflag
 		then
-			cd $WORKDIR/calculate-wallpapers-${useflag//CL}
+			cd "$WORKDIR/calculate-wallpapers-${useflag//CL}"
 			if [[ $useflag == CL22 ]]
 			then
 				mv usr/share/wallpapers/Calculate_Linux usr/share/wallpapers/Calculate_Linux_22
diff --git a/media-gfx/calculate-wallpapers/metadata.xml b/media-gfx/calculate-wallpapers/metadata.xml
index 456c7c2c1..482fbcb15 100644
--- a/media-gfx/calculate-wallpapers/metadata.xml
+++ b/media-gfx/calculate-wallpapers/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-wanted</herd>
+	<!-- maintainer-wanted -->
 	<longdescription lang="en">
 Wallpapers for Calculate Linux
 </longdescription>
diff --git a/media-gfx/dm-themes-calculate/metadata.xml b/media-gfx/dm-themes-calculate/metadata.xml
index 8498f5cde..866960ea0 100644
--- a/media-gfx/dm-themes-calculate/metadata.xml
+++ b/media-gfx/dm-themes-calculate/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-wanted</herd>
+	<!-- maintainer-wanted -->
 	<longdescription lang="en">
 Display manager wallpapers for Calculate Linux
 </longdescription>
diff --git a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
index 0178c386e..129e7208f 100644
--- a/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
+++ b/media-gfx/plasma-themes-calculate/plasma-themes-calculate-17.ebuild
@@ -14,7 +14,6 @@ IUSE=""
 
 SRC_URI="https://mirror.calculate-linux.org/themes/plasma/plasma-calculate-${PV}.tar.bz2"
 
-
 src_install() {
 	insinto /
 	doins -r .
diff --git a/media-gfx/splash-themes-calculate/metadata.xml b/media-gfx/splash-themes-calculate/metadata.xml
index 5919fca67..1a6b508c6 100644
--- a/media-gfx/splash-themes-calculate/metadata.xml
+++ b/media-gfx/splash-themes-calculate/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>maintainer-wanted</herd>
+	<!-- maintainer-wanted -->
 	<longdescription lang="en">
 Calculate Linux theme for gensplash
 </longdescription>