diff --git a/arch/base.md b/arch/base.md
index 79f51fd..3a71371 100644
--- a/arch/base.md
+++ b/arch/base.md
@@ -237,12 +237,11 @@ Follow most of the instructions here:
 
 ### AUR
 
-If you ever need anything from the AUR, yay is the tool to install it.
-
 ```bash
 pacman -S --needed git base-devel
-git clone https://aur.archlinux.org/yay.git
-cd yay
+mkdir ~/aur
+git clone <git repo from aur>
+cd <folder name>
 makepkg -si
 ```
 
diff --git a/arch/gaming.md b/arch/gaming.md
index 60d159c..818043b 100644
--- a/arch/gaming.md
+++ b/arch/gaming.md
@@ -176,7 +176,17 @@ pacman -U --noconfirm sunshine.pkg.tar.zst
 
 <https://github.com/moonlight-stream/moonlight-qt/releases>
 
-I just used the flatpak installer.
+Ctrl + Alt + Shift + Q (Moonlight Stream)
+Quit the streaming session (leaving the game running on the host PC)
+
+Ctrl + Alt + Shift + S (Moonlight Stream)
+Open performance stats overlay (not supported on Steam Link or Raspberry Pi)
+
+Ctrl + Alt + Shift + M (Moonlight Stream)
+Toggle mouse mode (pointer capture or direct control)
+
+Ctrl + Alt + Shift + V (Moonlight Stream)
+Type clipboard text on the host
 
 ### Configuration
 
@@ -266,9 +276,14 @@ Type=Application
 
 ## OBS
 
+<https://aur.archlinux.org/packages/obs-vkcapture-git>
+
 ```bash
 pacman -S obs-studio qt6-wayland
-yay -S obs-vkcapture-git
+cd ~/aur
+git clone https://aur.archlinux.org/obs-vkcapture-git.git
+cd obs-vkcapture-git
+makepkg -si
 ```
 
 Add "Game Capture" to your scene.
@@ -373,8 +388,13 @@ output.mp4
 
 <https://wiki.archlinux.org/title/minecraft>
 
+<https://aur.archlinux.org/packages/minecraft-launcher>
+
 ```bash
-yay -S minecraft-launcher
+cd ~/aur
+git clone https://aur.archlinux.org/minecraft-launcher.git
+cd minecraft-launcher
+makepkg -si
 ```
 
 ### MultiMC
@@ -386,8 +406,7 @@ on arch.
 <https://github.com/MultiMC/multimc-pkgbuild>
 
 ```bash
-mkdir /tmp/multimc
-cd /tmp/multimc
+cd ~/aur
 git clone https://github.com/MultiMC/multimc-pkgbuild.git
 cd multimc-pkgbuild
 makepkg -si
diff --git a/arch/workstation.md b/arch/workstation.md
index 1715ac8..209c557 100644
--- a/arch/workstation.md
+++ b/arch/workstation.md
@@ -34,6 +34,7 @@
     - [Development](#development)
   - [Cura](#cura)
   - [Creality Print](#creality-print)
+  - [Orca Slicer](#orca-slicer)
   - [AWS CLI](#aws-cli)
   - [NSlookup](#nslookup)
   - [rpi-imager](#rpi-imager)
@@ -104,7 +105,7 @@ pacman -S rsync which git iperf3 pwgen dosfstools exfatprogs gvfs gvfs-dnssd
 ## ZSH
 
 ```bash
-pacman -S zsh grml-zsh-config
+pacman -S zsh grml-zsh-config zsh-syntax-highlighting zsh-autosuggestions pkgfile
 chsh -s $(which zsh)
 
 cat <<EOF > ~/.zshrc
@@ -294,10 +295,15 @@ For the open source version of code install `code`:
 sudo pacman -S code
 ```
 
-For the proprietary version of vscode install `yay` and then:
+For the proprietary version of vscode use the AUR:
+
+<https://aur.archlinux.org/packages/visual-studio-code-bin>
 
 ```bash
-yay -S visual-studio-code-bin
+cd ~/aur
+git clone https://aur.archlinux.org/visual-studio-code-bin.git
+cd visual-studio-code-bin
+makepkg -si
 ```
 
 ### Shell
@@ -511,6 +517,31 @@ Icon=/home/ducoterra/.icons/creality_print.png
 Type=Application
 ```
 
+## Orca Slicer
+
+<https://github.com/SoftFever/OrcaSlicer>
+
+This is an open source fork of Bambu Slicer with more features.
+
+```bash
+# You might need to install webkit2gtk
+pacman -S webkit2gtk
+```
+
+```bash
+mv ~/Downloads/OrcaSlicer*.AppImage ~/Applications/OrcaSlicer.AppImage
+chmod +x ~/Applications/*.AppImage
+```
+
+```conf
+[Desktop Entry]
+Name=Orca Slicer
+Exec=/home/ducoterra/Applications/OrcaSlicer.AppImage
+Icon=/home/ducoterra/.icons/orca_slicer.png
+Type=Application
+```
+
+
 ## AWS CLI
 
 <https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html>
diff --git a/manjaro/ansible/arch_developer_tools/tasks/main.yml b/manjaro/ansible/arch_developer_tools/tasks/main.yml
index cafbe01..897de24 100644
--- a/manjaro/ansible/arch_developer_tools/tasks/main.yml
+++ b/manjaro/ansible/arch_developer_tools/tasks/main.yml
@@ -26,7 +26,6 @@
     - curl
     - wget
     - dconf-editor
-    - yay
     - unzip
     - avahi # bonjour service
   become: yes