diff --git a/.installer/packages b/.installer/packages
index 79b7133..cd93f07 100644
--- a/.installer/packages
+++ b/.installer/packages
@@ -1,24 +1,24 @@
-pacman-base:acpi,wget,curl # Required for setup_system.sh
-pacman-any:i3-gaps,feh,i3status,network-manager-applet,pasystray,xautolock,inotify-tools,xss-lock,noto-fonts-emoji
-pacman-any:zsh,tmux,code,vim,ufw,scrot,dunst,arandr,ranger,thunar,flameshot
-pacman-any:gst-libav,phonon-qt5-gstreamer,gst-plugins-good,qt5-quickcontrols,qt5-graphicaleffects,qt5-multimedia
+pacman-base:acpi wget curl # Required for setup_system.sh
+pacman-any:i3-gaps feh i3status network-manager-applet pasystray xautolock inotify-tools xss-lock noto-fonts-emoji
+pacman-any:zsh tmux code vim ufw scrot dunst arandr ranger thunar flameshot
+pacman-any:gst-libav phonon-qt5-gstreamer gst-plugins-good qt5-quickcontrols qt5-graphicaleffects qt5-multimedia
 pacman-laptop:brightnessctl
-aur-any:picom-git,sddm-theme-aerial-git
+aur-any:picom-git sddm-theme-aerial-git
 
-apt-base:acpi,wget,curl # Required for setup_system.sh
-apt-any:i3,feh,i3status,nm-tray,pasystray,xautolock,inotify-tools,xss-lock,fonts-noto-color-emoji,fonts-hack-ttf,xclip
-apt-any:chromium-browser,zsh,tmux,codium,vim,ufw,scrot,dunst,arandr,ranger,thunar,flameshot
-apt-any:libxext-dev,libxcb1-dev,libxcb-damage0-dev,libxcb-xfixes0-dev,libxcb-shape0-dev,libxcb-render-util0-dev,libxcb-render0-dev,libxcb-randr0-dev,libxcb-composite0-dev,libxcb-image0-dev,libxcb-present-dev,libxcb-xinerama0-dev,libxcb-glx0-dev,libpixman-1-dev,libdbus-1-dev,libconfig-dev,libgl1-mesa-dev,libpcre2-dev,libpcre3-dev,libevdev-dev,uthash-dev,libev-dev,libx11-xcb-dev,meson
-apt-any:python3,python3-pip
-apt-any:sddm,gstreamer1.0-libav,phonon4qt5-backend-gstreamer,gstreamer1.0-plugins-good,qml-module-qtquick-controls,qml-module-qtgraphicaleffects,qml-module-qtmultimedia
-apt-any:cargo,cmake,pkg-config,libfreetype6-dev,libfontconfig1-dev,libxcb-xfixes0-dev,libxkbcommon-dev,python3
-apt-any:libxcb-render0-dev,libffi-dev,python3-dev,python3-cffi
+apt-base:acpi wget curl # Required for setup_system.sh
+apt-any:i3 feh i3status nm-tray pasystray xautolock inotify-tools xss-lock fonts-noto-color-emoji fonts-hack-ttf xclip
+apt-any:chromium-browser zsh tmux codium vim ufw scrot dunst arandr ranger thunar flameshot
+apt-any:libxext-dev libxcb1-dev libxcb-damage0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-randr0-dev libxcb-composite0-dev libxcb-image0-dev libxcb-present-dev libxcb-xinerama0-dev libxcb-glx0-dev libpixman-1-dev libdbus-1-dev libconfig-dev libgl1-mesa-dev libpcre2-dev libpcre3-dev libevdev-dev uthash-dev libev-dev libx11-xcb-dev meson
+apt-any:python3 python3-pip
+apt-any:sddm gstreamer1.0-libav phonon4qt5-backend-gstreamer gstreamer1.0-plugins-good qml-module-qtquick-controls qml-module-qtgraphicaleffects qml-module-qtmultimedia
+apt-any:cargo cmake pkg-config libfreetype6-dev libfontconfig1-dev libxcb-xfixes0-dev libxkbcommon-dev python3
+apt-any:libxcb-render0-dev libffi-dev python3-dev python3-cffi
 apt-any:libpam-u2f
 apt-laptop:brightnessctl
 pip-any:flashfocus
 
-brew-formulas-any:azure-cli
-brew-formulas-any:kubectl,helm,shellcheck,velero,azure/kubelogin/kubelogin,derailed/k9s/k9s,fluxcd/tap/flux,weaveworks/tap/gitops
-brew-formulas-any:zsh-autosuggestions,zsh-history-substring-search,zsh-syntax-highlighting
+brew-any:azure-cli
+brew-any:kubectl helm shellcheck velero azure/kubelogin/kubelogin derailed/k9s/k9s fluxcd/tap/flux weaveworks/tap/gitops # Kubernetes related
+brew-any:zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting # ZSH related
 
-krew-any:ctx,krew,ns,slice,stern,tree
+krew-any:ctx krew ns slice stern tree
diff --git a/setup_system.sh b/setup_system.sh
index 98c3852..dc12b63 100755
--- a/setup_system.sh
+++ b/setup_system.sh
@@ -59,7 +59,7 @@ function get_packages() {
 
     for target in "$@"; do
         while read -r row; do
-            for package in ${row//,/ }; do
+            for package in $row; do
                 echo "$package"
             done
         done <<<"$(grep "^${target:?}:" "$pkg_file" | cut -d: -f2 | cut -d# -f1)"
@@ -148,7 +148,7 @@ function setup_homebrew() {
 }
 
 function setup_brew_formulas() {
-    local targets=("brew-formulas-any")
+    local targets=("brew-any")
 
     brew update || return 1