diff --git a/update_arch.sh b/update_arch.sh
index bcb5455..9400530 100755
--- a/update_arch.sh
+++ b/update_arch.sh
@@ -13,7 +13,8 @@ HOSTNAME=$(hostname | awk '{ print toupper($0) }')
 
 GAME="no"
 VR="no"
-DESKTOP="no"
+DESKTOP_BASE="no"
+DESKTOP_WORK="no"
 CODE="no"
 NVIDIA_GPU="no"
 NVIDIA_1080_GPU="no"
@@ -22,7 +23,8 @@ HYPERLAND="no"
 KDE="no"
 
 if [ "$HOSTNAME" == "CMBOX" ]; then
-    DESKTOP="yes"
+    DESKTOP_BASE="yes"
+    DESKTOP_WORK="yes"
     CODE="yes"
     TERMINAL="yes"
     HYPERLAND="yes"
@@ -30,13 +32,13 @@ fi
 if [ "$HOSTNAME" == "STEAMBOX" ]; then
     GAME="yes"
     VR="yes"
-    DESKTOP="yes"
+    DESKTOP_BASE="yes"
     NVIDIA_GPU="yes"
     TERMINAL="yes"
     HYPERLAND="yes"
 fi
 if [ "$HOSTNAME" == "LABBOX" ]; then
-    DESKTOP="yes"
+    DESKTOP_BASE="yes"
     CODE="yes"
     TERMINAL="yes"
     HYPERLAND="yes"
@@ -44,7 +46,7 @@ fi
 if [ "$HOSTNAME" == "SIMONBOX" ]; then
     GAME="yes"
     VR="yes"
-    DESKTOP="yes"
+    DESKTOP_BASE="yes"
     NVIDIA_1080_GPU="yes"
     TERMINAL="yes"
     KDE="yes"
@@ -70,8 +72,11 @@ fi
 if [ "$VR" == "yes" ]; then
     printf -- 'VR, '
 fi
-if [ "$DESKTOP" == "yes" ]; then
-    printf -- 'DESKTOP, '
+if [ "$DESKTOP_BASE" == "yes" ]; then
+    printf -- 'DESKTOP_BASE, '
+fi
+if [ "$DESKTOP_WORK" == "yes" ]; then
+    printf -- 'DESKTOP_WORK, '
 fi
 if [ "$CODE" == "yes" ]; then
     printf -- 'CODE, '
@@ -340,17 +345,11 @@ if [ "$CODE" == "yes" ]; then
 fi
 
 # Install desktop utility
-if [ "$DESKTOP" == "yes" ]; then
-    printf -- '\033[33m Installing desktop utilities\n\033[37m'
-    sudo pacman --noconfirm --needed -S kicad freecad feh
+if [ "$DESKTOP_BASE" == "yes" ]; then
+    printf -- '\033[33m Installing desktop base utilities\n\033[37m'
+    sudo pacman --noconfirm --needed -S feh
     flatpak install -y flathub io.github.equicord.equibop
     flatpak install -y flathub com.behringer.XAirEdit
-    flatpak install -y flathub org.kde.krita
-    flatpak install -y flathub com.prusa3d.PrusaSlicer
-    flatpak install -y flathub com.moonlight_stream.Moonlight
-    flatpak install -y flathub com.jgraph.drawio.desktop
-    flatpak install -y flathub org.gimp.GIMP
-    flatpak install -y flathub org.remmina.Remmina
     yay --noconfirm -S --needed --aur brave-bin
 
     printf -- '\033[33m Installing NerdFonts\n\033[37m'
@@ -379,14 +378,28 @@ if [ "$DESKTOP" == "yes" ]; then
     systemctl --user start sunshine
 fi
 
+if [ "$DESKTOP_WORK" == "yes" ]; then
+    printf -- '\033[33m Installing desktop work utilities\n\033[37m'
+    sudo pacman --noconfirm --needed -S kicad freecad
+    flatpak install -y flathub org.kde.krita
+    flatpak install -y flathub com.prusa3d.PrusaSlicer
+    flatpak install -y flathub com.jgraph.drawio.desktop
+    flatpak install -y flathub org.gimp.GIMP
+    flatpak install -y flathub org.remmina.Remmina
+    flatpak install -y flathub com.moonlight_stream.Moonlight
+fi
+
 # Install game utility
 if [ "$GAME" == "yes" ]; then
     printf -- '\033[33m Installing game utilities\n\033[37m'
-    sudo pacman -S --noconfirm --needed steam wine-staging winetricks wine-mono wine-gecko lutris
+    sudo pacman -S --noconfirm --needed steam
     yay --noconfirm -S --needed --aur protonup-qt protontricks
+    sudo pacman -S --noconfirm --needed wine-staging winetricks wine-mono wine-gecko
     yay --noconfirm -S --needed --aur lug-helper
     yay --noconfirm -S --needed --aur opentrack-git
     yay --noconfirm -S --needed --aur openmpi
+    sudo pacman -S --noconfirm --needed fluidsynth gamemode gvfs libayatana-appindicator innoextract lib32-gamemode lib32-vkd3d python-pefile python-protobuf vulkan-icd-loader vkd3d lib32-vulkan-icd-loader vulkan-tools xorg-xgamma umu-launcher
+    sudo pacman -S --noconfirm --needed lutris
 fi
 
 # Install vr utility