diff --git a/ManuSurface/ManuSurfaceSetup.md b/ManuSurface/ManuSurfaceSetup.md
index d1cd8e61..58d078f0 100644
--- a/ManuSurface/ManuSurfaceSetup.md
+++ b/ManuSurface/ManuSurfaceSetup.md
@@ -14,61 +14,12 @@ The steps described here allow the creation of a linux system on a Surface Book
   - Generate SSH-key
   - Install `linux-surface`  
     See: <https://github.com/linux-surface/linux-surface/wiki/Installation-and-Setup>
-    - ```bash
-      wget -qO - https://raw.githubusercontent.com/linux-surface/linux-surface/master/pkg/keys/surface.asc \
-          | gpg --dearmor | sudo dd of=/etc/apt/trusted.gpg.d/linux-surface.gpg
-      ```
-    - ```bash
-      echo "deb [arch=amd64] https://pkg.surfacelinux.com/debian release main" \
-          | sudo tee /etc/apt/sources.list.d/linux-surface.list
-      ```
-    - ```bash
-      sudo apt update
-      ```
-    - ```bash
-      sudo apt install linux-image-surface linux-headers-surface iptsd libwacom-surface
-      ```
-    - ```bash
-      sudo systemctl enable iptsd
-      ```
-    - ```bash
-      wget https://github.com/linux-surface/surface-dtx-daemon/releases/download/v0.3.3-2/surface-dtx-daemon_0.3.3-2_amd64.deb -O dtx.deb
-      sudo dpkg -i dtx.deb
-      rm dtx.deb
-      ```
+    - Using [installer script](../scripts/PopOS/linux-surface.sh)
   - Enable Secure Boot  
     As seen here: <https://wiki.archlinux.org/title/Unified_Extensible_Firmware_Interface/Secure_Boot#Set_up_shim>
-    - Implement Secure Boot
-      - Copy signed Bootloader to UEFI partition:  
-        ```bash
-        wget https://blog.hansenpartnership.com/wp-uploads/2013/HashTool.efi
-        wget https://blog.hansenpartnership.com/wp-uploads/2013/PreLoader.efi
-        cp {HashTool,PreLoader}.efi /boot/efi/EFI/systemd/
-        cp /boot/efi/EFI/systemd/systemd-bootx64.efi /boot/efi/EFI/systemd/loader.efi
-        ```
-      - Add boot entry  
-        ```bash
-        efibootmgr --unicode --disk /dev/nvme0n1 --part 0 --create --label "PreLoader" --loader /EFI/systemd/PreLoader.efi
-        ```
-      - Add fallbacks  
-        ```bash
-        cp ./HashTool.efi /boot/efi/EFI/BOOT/
-        cp /boot/efi/EFI/systemd/systemd-bootx64.efi /boot/efi/EFI/BOOT/loader.efi
-        cp ./PreLoader.efi /boot/efi/EFI/BOOT/BOOTx64.EFI
-        ```
-      - Ensure support for Microsoft infected devices  
-        ```bash
-        mkdir -p /boot/efi/EFI/Microsoft/Boot
-        cp ./PreLoader.efi /boot/efi/EFI/Microsoft/Boot/bootmgfw.efi
-        cp ./HashTool.efi /boot/efi/EFI/Microsoft/Boot/
-        cp /boot/efi/EFI/systemd/systemd-bootx64.efi /boot/efi/EFI/Microsoft/Boot/loader.efi
-        ```
+    - Usiing [installer script](../scripts/PopOS/secure-boot.sh)
   - Install `tea`
-    ```bash
-    wget https://dl.gitea.io/tea/0.9.0/tea-0.9.0-linux-amd64 -O tea
-    sudo install tea /usr/local/bin
-    rm tea
-    ```
+    - Using [installer script](../scripts/PopOS/software/tea.sh)
 
 ## Enhancement
   - Install `Gnome Extension Manager`