diff --git a/jka-toolkit/apw b/jka-toolkit/apw
index aa889e8..b8f682f 100755
--- a/jka-toolkit/apw
+++ b/jka-toolkit/apw
@@ -12,18 +12,19 @@ shopt -s nocasematch
 #Basic info echo
 case "$1" in
 	*h)
-		echo "apw - A Packager Wrapper, a Idea from JKA Network, version 1.5"
+		echo "apw - A Packager Wrapper, a Idea from JKA Network, version 1.6"
 		echo "	Usage: apw <option> [packages]"
 		echo "	{-h | h} 	Show this help"
 		echo "	{-U | U}	Update system"
 		echo "	{-I | I}	Install packages (Updates system also for preventing problems)"
+		echo "	{-Ir | Ir}	Reinstall packages (Updates system also for preventing problems)"
 		echo "	{-R | R}	Removes a package"
 		echo "	{-Rd | Rd}	Removes a package along with dependencies that are not more in use (Only for Arch)"
 		echo "	{-C | C}	Clean temp files"
 		echo "	{-Cd | Cd}	Clean system from dependencies that are not in use (ADVANCED, BE CAREFUL!)"
 		echo "	{-S | S}	Search in package database"
 		echo "	{-F | F}	Install file (distro family dependent, e.g. .deb , .pkg.tar.xz,...)"
-		echo "	Add y to -U or -I (-Uy -Iy) for autoconfirm the operations"
+		echo "	Append y to -U or -I (-Uy -Iy -Iry) for autoconfirm the operations"
 		exit
 		;;
 	"")
@@ -120,7 +121,7 @@ case "$1" in
 			apt)
 				apt update && apt install $packages;;
 			pacman)
-				pacman -Syu $packages;;
+				pacman -Syu $packages --needed;;
 			yum | dnf | zypper)
 				$SO install $packages;;
 		esac;;
@@ -129,11 +130,32 @@ case "$1" in
 		case "$SO" in
 			apt)
 				apt update && apt -y install $packages;;
+			pacman)
+				pacman -Syu $packages --noconfirm --needed;;
+			yum | dnf | zypper)
+				echo "Not supported, I don't know the command. Doing a -I instead"
+				$SO install $packages;;
+		esac;;
+	*Ir)
+		echo "You are going to reinstall $packages"
+		case "$SO" in
+			apt)
+				apt update && apt install --reinstall $packages;;
+			pacman)
+				pacman -Syu $packages;;
+			yum | dnf | zypper)
+				$SO reinstall $packages;;
+		esac;;
+	*Iry)
+		echo "You are going to reinstall $packages"
+		case "$SO" in
+			apt)
+				apt update && apt -y install --reinstall $packages;;
 			pacman)
 				pacman -Syu $packages --noconfirm;;
 			yum | dnf | zypper)
-				echo "Not supported, I didn't know the command. Doing a -I instead"
-				$SO install $packages;;
+				echo "Not supported, I don't know the command. Doing a -Ir instead"
+				$SO reinstall $packages;;
 		esac;;
 	*R)
 		echo "You are going to remove $packages"
@@ -145,6 +167,17 @@ case "$1" in
 			yum | dnf | zypper)
 				$SO remove $packages;;
 		esac;;
+	*Ry)
+		echo "You are going to remove $packages"
+		case "$SO" in
+			apt)
+				apt -y remove $packages;;
+			pacman)
+				pacman -R $packages --noconfirm;;
+			yum | dnf | zypper)
+				echo "Not supported, I don't know the command. Doing a -R instead"
+				$SO remove $packages;;
+		esac;;
 	*Rd)
 		echo "Removing $packages along with his dependencies that are not more in use" 
 		case "$SO" in
@@ -153,6 +186,14 @@ case "$1" in
 			*)
 			echo "I don't know how to do this option in this packager";;
 		esac;;
+	*Rdy)
+		echo "Removing $packages along with his dependencies that are not more in use" 
+		case "$SO" in
+			pacman)
+				pacman -Rs $packages --noconfirm;;
+			*)
+			echo "I don't know how to do this option in this packager";;
+		esac;;
 	*C)
 		echo "Cleaning package manager"
 		case "$SO" in
@@ -168,7 +209,7 @@ case "$1" in
 			dnf)
 				dnf clean all --enablerepo=\*;;
 			zypper)
-				echo "I doesn't know this option in Zypper";;
+				echo "I don't know this option in Zypper";;
 		esac;;
 	*Cd)
 		echo "Cleaning system from dependencies that are not in use (BE CAREFUL, ONLY ADVANCED)"
diff --git a/pkgbuild/.SRCINFO b/pkgbuild/.SRCINFO
deleted file mode 100644
index 76ac02d..0000000
--- a/pkgbuild/.SRCINFO
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgbase = jka-toolkit
-	pkgdesc = Set of scripts to optimize the daily work in linux shell (jkazip and apw)
-	pkgver = 0.2.7
-	pkgrel = 2
-	url = http://proyecto.jkanetwork.com
-	install = jka-toolkit.install
-	arch = any
-	license = GPL3
-	depends = p7zip
-	depends = unrar
-	depends = unzip
-	depends = zip
-	provides = jkazip
-	provides = apw
-	options = !emptydirs
-	source = https://gitlab.com/JKANetwork/jka-toolkit/raw/master/jka-toolkit.tar.gz
-	md5sums = 51617d9917a3b12feba935ab56cb450d
-	
-pkgname = jka-toolkit
-
diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD
deleted file mode 100644
index e1fb2a3..0000000
--- a/pkgbuild/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: JKA Network (JoseluCross, Kprkpr, Yukialba) <contacto@jkanetwork.com>
-pkgname=jka-toolkit
-pkgver=0.2.7
-pkgrel=2
-pkgdesc="Set of scripts to optimize the daily work in linux shell (jkazip and apw)"
-arch=('any')
-url="http://proyecto.jkanetwork.com"
-license=('GPL3')
-depends=('p7zip' 'unrar' 'unzip' 'zip')
-provides=('jkazip' 'apw')
-options=(!emptydirs)
-install=$pkgname.install
-source=(https://gitlab.com/JKANetwork/jka-toolkit/raw/master/jka-toolkit.tar.gz)
-md5sums=('51617d9917a3b12feba935ab56cb450d')
-
-package() {
-  cd "$srcdir/$pkgname"
-  mkdir -p $pkgdir/usr/bin
-  install -Dm755 * "$pkgdir/usr/bin/" 
-}
diff --git a/pkgbuild/jka-toolkit.install b/pkgbuild/jka-toolkit.install
deleted file mode 100644
index cef5576..0000000
--- a/pkgbuild/jka-toolkit.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-	echo "Thanks for installing this kit"
-	echo "Scripts"
-	echo "jkazip - de/compress files and directories in many formats very easy"
-	echo "apw - A Package Wrapper"
-}
-post_upgrade() {
-	post_install
-}
\ No newline at end of file