diff --git a/crates/01-ssh/crate.sh b/crates/01-ssh/crate.sh
index 2c187de..6801c37 100644
--- a/crates/01-ssh/crate.sh
+++ b/crates/01-ssh/crate.sh
@@ -2,8 +2,9 @@
 
 describe="setup ssh"
 
-apply() { 
+apply() {
     [ -e "$HOME/.ssh/authorized_keys" ] || ln files/authorized_keys $HOME/.ssh/authorized_keys
+    [ -e "$HOME/.ssh/config" ] || ln files/config $HOME/.ssh/config
     if ! [ -f "$HOME/.ssh/id_rsa" ]; then
         echo "Creating new ssh key for this device..."
         ssh-keygen -f $HOME/.ssh/id_rsa -p "" -q
@@ -14,4 +15,4 @@ apply() {
 
 undo() {
     echo "Undoing ssh keys is not supported, please do this manually."
-}
\ No newline at end of file
+}
diff --git a/crates/01-ssh/files/config b/crates/01-ssh/files/config
new file mode 100644
index 0000000..8c9646d
--- /dev/null
+++ b/crates/01-ssh/files/config
@@ -0,0 +1,22 @@
+## neb servers
+
+# hydrogen red helix
+Host H
+    Hostname hydrogen.red.helix.saluco.nl
+
+# argon red helix
+Host A
+    Hostname argon.red.helix.saluco.nl
+
+# iron red sphere
+Host I
+    Hostname iron.red.sphere.saluco.nl
+
+## utility servers
+Host git
+    Hostname git.saluco.nl
+    User git
+
+Host github
+    Hostname github.com
+    User git
diff --git a/crates/05-i3/crate.arch.sh b/crates/05-i3/crate.arch.sh
index 41e73a0..ccffa03 100644
--- a/crates/05-i3/crate.arch.sh
+++ b/crates/05-i3/crate.arch.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-pkgs="i3 i3lock i3status libpulse brightnessctl xss-lock dex maim dmenu gnome-keyring feh picom"
+pkgs="i3 i3lock i3status libpulse-mainloop-glib brightnessctl xss-lock dex maim dmenu gnome-keyring feh picom"
 
 super_apply() {
-    pacman -S --needed --noconfirm $pkgs
+    apt install -y $pkgs
 }
 
 super_undo() {
-    pacman -R --noconfirm $pkgs
+    apt remove -y $pkgs
 }
diff --git a/crates/05-i3/crate.pop.sh b/crates/05-i3/crate.pop.sh
new file mode 100644
index 0000000..41e73a0
--- /dev/null
+++ b/crates/05-i3/crate.pop.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+pkgs="i3 i3lock i3status libpulse brightnessctl xss-lock dex maim dmenu gnome-keyring feh picom"
+
+super_apply() {
+    pacman -S --needed --noconfirm $pkgs
+}
+
+super_undo() {
+    pacman -R --noconfirm $pkgs
+}
diff --git a/crates/10-zsh/crate.debian.sh b/crates/10-zsh/crate.debian.sh
index 7f0af81..33b0fcc 100644
--- a/crates/10-zsh/crate.debian.sh
+++ b/crates/10-zsh/crate.debian.sh
@@ -3,5 +3,5 @@ super_apply() {
 }
 
 super_undo() {
-    pacman -R --noconfirm zsh
-}
\ No newline at end of file
+    apt remove -y zsh
+}
diff --git a/crates/10-zsh/crate.pop.sh b/crates/10-zsh/crate.pop.sh
new file mode 100644
index 0000000..33b0fcc
--- /dev/null
+++ b/crates/10-zsh/crate.pop.sh
@@ -0,0 +1,7 @@
+super_apply() {
+    apt install -y zsh
+}
+
+super_undo() {
+    apt remove -y zsh
+}
diff --git a/crates/30-alacritty/crate.pop.sh b/crates/30-alacritty/crate.pop.sh
new file mode 100644
index 0000000..27ea4e9
--- /dev/null
+++ b/crates/30-alacritty/crate.pop.sh
@@ -0,0 +1,7 @@
+super_apply() {
+    apt install -y alacritty
+}
+
+super_undo() {
+    apt remove -y alacritty
+}