diff --git a/src/cpio/.gitignore b/src/cpio/.gitignore
deleted file mode 100644
index 8b56c9f..0000000
--- a/src/cpio/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cache/
-dist/
-root/
diff --git a/src/cpio/changes.md b/src/cpio/changes.md
deleted file mode 100644
index 186f094..0000000
--- a/src/cpio/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 2.14
-First version
diff --git a/src/cpio/pkg.sh b/src/cpio/pkg.sh
deleted file mode 100644
index ae703b8..0000000
--- a/src/cpio/pkg.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-NAME="cpio"
-DESC="Tools for archiving"
-VERSION="2.14"
-FILES=("https://ftp.gnu.org/gnu/cpio/cpio-$VERSION.tar.bz2")
-HASHES=("b153e1843561841d37190e48b891188d")
-DEPENDS=()
-
-PACKAGE() {
-  tar xf $NAME-$VERSION.tar.bz2 
-	cd $NAME-$VERSION
-	
-	./configure --prefix=/usr \
-            --enable-mt   \
-            --with-rmt=/usr/libexec/rmt &&
-	make &&
-	makeinfo --html            -o doc/html      doc/cpio.texi &&
-	makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi &&
-	makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi
-
-	make DESTDIR=$ROOTDIR install &&
-	install -v -m755 -d $ROOTDIR/usr/share/doc/cpio-$VERSION/html
-	install -v -m644    doc/html/* \
-											$ROOTDIR/usr/share/doc/cpio-$VERSION/html
-	install -v -m644    doc/cpio.{html,txt} \
-											$ROOTDIR/usr/share/doc/cpio-$VERSION
-
-  cd .. && rm -rf $NAME-$VERSION
-}
diff --git a/src/gpicview/pkg.sh b/src/gpicview/pkg.sh
index 787b6a7..742927b 100644
--- a/src/gpicview/pkg.sh
+++ b/src/gpicview/pkg.sh
@@ -1,17 +1,22 @@
 NAME="gpicview"
 DESC="Lightweight image viewer"
 VERSION="0.2.5"
-FILES=("https://downloads.sourceforge.net/lxde/gpicview-$VERSION.tar.xz")
+
+FILES=("https://downloads.sourceforge.net/lxde/gpicview-${VERSION}.tar.xz")
 HASHES=("26be9b0c5a234f1afe7d83d02a4a33f4")
+
 DEPENDS=("gtk2")
+BUILD=("intltool")
 
 PACKAGE() {
-  tar xf $NAME-$VERSION.tar.xz
-  cd $NAME-$VERSION
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
 
+  export CFLAGS="${CFLAGS} -std=gnu89"
   ./configure --prefix=/usr
-  make && make DESTDIR="$ROOTDIR" install
-  sed -i 's/Utility;//' "$ROOTDIR/usr/share/applications/gpicview.desktop"
+  make
+  make DESTDIR="${ROOTDIR}" install
+  sed -i 's/Utility;//' "${ROOTDIR}/usr/share/applications/gpicview.desktop"
 
-  cd .. && rm -r $NAME-$VERSION
+  cd .. && rm -r "${NAME}-${VERSION}"
 }
diff --git a/src/tools/.gitignore b/src/tools/.gitignore
deleted file mode 100644
index 8b56c9f..0000000
--- a/src/tools/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cache/
-dist/
-root/
diff --git a/src/tools/changes.md b/src/tools/changes.md
deleted file mode 100644
index a902b2f..0000000
--- a/src/tools/changes.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# 24.03
-First version
diff --git a/src/tools/pkg.sh b/src/tools/pkg.sh
deleted file mode 100644
index 9df8c6c..0000000
--- a/src/tools/pkg.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-NAME="tools"
-DESC="Matterlinux tools and scripts collection"
-VERSION="24.03"
-FILES=("https://git.matterlinux.xyz/Matter/tools/archive/$VERSION.tar.gz")
-HASHES=("7c517a9e42b3f819612bcda72e5eb43f131cf538c0cea0b9da9099ca66a4d0ca")
-DEPENDS=("bash")
-
-PACKAGE() {
-  tar xf $VERSION.tar.gz
-  cd $NAME
-  mkdir -p $ROOTDIR/usr/bin
-  make DESTDIR=$ROOTDIR install
-  cd .. && rm -rf $NAME
-}