diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..62399af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.tar.*
+src/
+pkg/
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..83d0f0b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,8 @@
+package:
+	tar -czvf terminal.tar.gz terminal/
+	makepkg -si
+
+clean:
+	rm -rf src
+	rm -rf pkg
+	rm *.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index cdcebeb..183fa0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Your Name <your.email@example.com>
+# Maintainer: Itamar ion606@protonmail.com
 
 pkgname=ion-terminal-config
 pkgver=1.0
@@ -8,21 +8,19 @@ arch=('any')
 url="https://github.com/ION606/fish-config"
 license=('MIT')
 depends=('alacritty' 'starship' 'fish' 'glow')
-source=('install.sh' 'terminal/')
+source=('install.sh' 'terminal.tar.gz')
 sha256sums=('SKIP' 'SKIP')
 
+prepare() {
+    # Extract the terminal.tar.gz archive
+    tar -xzf terminal.tar.gz
+}
+
 package() {
+    # Install the system-wide configurations if needed (optional)
     install -Dm644 terminal/alacritty.toml "$pkgdir/etc/terminal/alacritty.toml"
     install -Dm644 terminal/starship.toml "$pkgdir/etc/terminal/starship.toml"
 
-    # Fish config
-    install -Dm644 terminal/fish/config.fish "$pkgdir/etc/fish/config.fish"
-    install -Dm644 terminal/fish/fish_variables "$pkgdir/etc/fish/fish_variables"
-    install -Dm644 terminal/fish/completions/glow.fish "$pkgdir/etc/fish/completions/glow.fish"
-    install -Dm644 terminal/fish/conf.d/colors.fish "$pkgdir/etc/fish/conf.d/colors.fish"
-    install -Dm644 terminal/fish/functions/builtins.fish "$pkgdir/etc/fish/functions/builtins.fish"
-    install -Dm644 terminal/fish/functions/commands.fish "$pkgdir/etc/fish/functions/commands.fish"
-
-    # Post-install script
+    # Provide a user-specific installation script
     install -Dm755 install.sh "$pkgdir/usr/bin/apply-terminal-config"
 }
diff --git a/install.sh b/install.sh
index 9785315..7f8812b 100755
--- a/install.sh
+++ b/install.sh
@@ -39,3 +39,6 @@ cp terminal/alacritty.toml ~/.config/alacritty/alacritty.toml
 
 # Replace the starship configuration file (appending is not ideal here)
 cp terminal/starship.toml ~/.config/starship.toml
+
+# source it
+source ~/.config/fish/config.fish