diff --git a/packages/arch/bspwm b/packages/arch/bspwm
new file mode 100644
index 0000000..3562075
--- /dev/null
+++ b/packages/arch/bspwm
@@ -0,0 +1,23 @@
+xorg-server
+xorg-xinit
+
+xdo
+xorg-xprop
+
+xcape
+
+bspwm
+sxhkd
+
+compton
+
+alsa-utils
+
+zathura
+zathura-djvu
+zathura-pdf-mupdf
+
+mpv
+feh
+
+weechat
diff --git a/packages/arch/common b/packages/arch/common
index 6fb5ed4..5ac360c 100644
--- a/packages/arch/common
+++ b/packages/arch/common
@@ -39,6 +39,15 @@ borg
 youtube-dl
 neofetch
 
+ranger
+w3m
+sc
+sox
+
+mpc
+mcd
+ncmpcpp
+
 pygmentize
 xclip
 
@@ -65,3 +74,6 @@ llvm
 rustup
 
 jdk10-openjdk
+
+docker
+docker-compose
diff --git a/sh/203-bspwm b/sh/203-bspwm
deleted file mode 100644
index f3d9e47..0000000
--- a/sh/203-bspwm
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# bspwm is the best window manager. It does one thing really
-# well and supports running commands directly through the shell.
-#
-# I used to love bspwm a lot. I still do, but it's not as useful
-# now that I know how to use tmux. By using a terminal multiplexer,
-# the issue of organizing several terminal windows in one view is
-# solved without having to depend on the window manager.
-#
-# bspwm is still useful when you want a minimal setup with no
-# overhead, since it performs exceptionally well compared to other
-# desktop environments riddled with features. Plus, it supports
-# HiDPI really well, with the exception of some older programs.
-#
-# The Simple X Hotkey Daemon (sxhkd) is used to make keyboard
-# bindings so you can interact with bspwm. Make sure your bspwmrc
-# file is executable (chmod +x) as well.
-#
-# https://wiki.archlinux.org/index.php/Bspwm
-
-set -xe
-
-# Install xorg as the display server (required)
-sudo pacman -S xorg-server
-
-# Prerequisite for running bspwm without a display manager
-# Remove this line if you're using one
-sudo pacman -S xorg-xinit
-
-sudo pacman -S xdo           # Show / hide windows (for polybar)
-sudo pacman -S xorg-xprop    # Get window status (for polybar)
-
-sudo pacman -S xclip         # Clipboard manager (to copy with a command)
-sudo pacman -S xcape         # Make Caps Lock = Ctrl/ESC
-
-# The actual window manager and hotkey daemon
-sudo pacman -S bspwm
-sudo pacman -S sxhkd
-
-# compton is the standard compositor.
-sudo pacman -S compton
-
-# polybar is the standard panel.
-yay -S polybar
diff --git a/sh/504-launch b/sh/504-launch
deleted file mode 100644
index 64b2ae8..0000000
--- a/sh/504-launch
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# `launch-cmd` is used to "launch" programs from the shell.
-# This method of starting programs prevents it from logging to
-# the shell and blocking the next command.
-#
-# https://github.com/silverhammermba/launch
-
-set -xe
-
-yay -S launch-cmd