diff --git a/packages/Makefile b/packages/Makefile
index 31251e6..fd14fa5 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,15 +1,46 @@
-PACKAGES=vim git traceroute command-not-found dnsutils firefox screen htop
+PACKAGES=traceroute command-not-found dnsutils
 RM_PACKAGES=nano
 
 APT=aptitude
 ROOT_APT=sudo $(APT)
 APTITUDE=/usr/bin/aptitude
 
-install: $(APTITUDE)
+VIM=/usr/bin/vim
+GIT=/usr/bin/git
+FIREFOX=/usr/bin/firefox
+SCREEN=/usr/bin/screen
+HTOP=/usr/bin/htop
+TMUX=/usr/bin/tmux
+
+INSTALL=$(ROOT_APT) install -y
+
+install: $(APTITUDE) $(VIM) $(GIT) $(FIREFOX) $(SCREEN) $(HTOP) $(TMUX)
 	$(ROOT_APT) update
-	$(ROOT_APT) install -y $(PACKAGES)
+	$(INSTALL) $(PACKAGES)
 	$(ROOT_APT) purge -y $(RM_PACKAGES)
 
 $(APTITUDE):
 	sudo apt update
 	sudo apt install -y $(APT)
+
+$(VIM): $(APTITUDE)
+	$(INSTALL) vim
+
+$(GIT): $(APTITUDE)
+	$(INSTALL) git
+
+$(FIREFOX): $(APTITUDE)
+ifeq ($(shell lsb_release -i -s), 'Ubuntu')
+	$(INSTALL) firefox
+else
+	$(INSTALL) firefox-esr
+endif
+
+$(SCREEN): $(APTITUDE)
+	$(INSTALL) screen
+
+$(HTOP): $(APTITUDE)
+	$(INSTALL) htop
+
+$(TMUX): $(APTITUDE)
+	$(INSTALL) tmux