diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index c54bd23..7afba91 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -63,40 +63,41 @@ else
     printf "\n# yay already installed #######################################################\n\n"
 end
 
-set PACKAGES \
+set PACKAGES
+
 acpilight adobe-source-han-sans-jp-fonts asar ascii aspell-en aspell-fr assimp \
 awesome-terminal-fonts base-devel bat biber bleachbit bluez-firmware \
-bluez-utils bookworm boost bzip2 chicken chromium clisp compton cppcheck \
+bluez-utils bookworm boost bzip2 ccls chicken chromium clisp compton cppcheck \
 cppreference cppreference-devhelp cpupower cronie cryptsetup device-mapper \
 diffutils discord-canary discount ditaa dmenu dmenu-lpass docker \
-docker-compose doxygen dunst dwarffortress emacs exfat-utils farbfeld feh \
-ffmpegthumbnailer findutils firefox flake8 font-mathematica fontforge freeglut \
-fzf gcc-libs gdb gimp glibc gnome-disk-utility gnome-epub-thumbnailer \
-gnu-free-fonts gnuplot go-tools golangci-lint-bin graphviz htop i3-gaps \
-i3lock-blur i3status igdm-bin inetutils j4-dmenu-desktop \
-javascript-typescript-langserver js-beautify jfsutils jmtpfs lastpass-cli less \
-linux-headers lldb logrotate lvm2 ly-git meson minted mpc mpd \
-mpd-rich-presence-discord-git mpv mupdf-tools nano ncdu ncmpcpp \
-nemo-fileroller nemo-preview neofetch neovim netctl networkmanager \
+docker-compose dockerfile-language-server-bin doxygen dunst dwarffortress \
+emacs exfat-utils farbfeld feh ffmpegthumbnailer findutils firefox flake8 \
+font-mathematica fontforge freeglut fzf gcc-libs gdb gimp glibc \
+gnome-disk-utility gnome-epub-thumbnailer gnu-free-fonts gnuplot go-tools \
+golangci-lint-bin graphviz htop i3-gaps i3lock-blur i3status igdm-bin \
+inetutils j4-dmenu-desktop javascript-typescript-langserver js-beautify \
+jfsutils jmtpfs lastpass-cli less linux-headers lldb logrotate lvm2 ly-git \
+meson minted mpc mpd mpd-rich-presence-discord-git mpv mupdf-tools nano ncdu \
+ncmpcpp nemo-fileroller nemo-preview neofetch neovim netctl networkmanager \
 networkmanager-openvpn nm-connection-editor nnn nodejs-vmd nomacs nordvpn-bin \
 noto-fonts-emoji npm ntfs-3g numlockx openssh otf-fandol otf-ipafont p7zip \
 pacman-contrib pandoc-bin pavucontrol pciutils pcurses pdfpc polybar prettier \
 pulseaudio-bluetooth python-autoflake python-envtpl-git python-epc \
 python-importmagic python-language-server python-nose python-pip python-ptvsd \
-python-pytest python-pywal qemu r raw-thumbnailer reflector rofi \
-rofi-wifi-menu-git rsync rtv rustup s-nail samba scrot sent shadow siji-git \
-simplescreenrecorder speedcrunch sshfs st-luke-git swi-prolog texlive-bin \
-texlive-langchinese texlive-langcyrillic texlive-langgreek \
+python-pytest python-pywal qt5-imageformats qemu r raw-thumbnailer reflector \
+rofi rofi-wifi-menu-git rsync rtv rustup s-nail samba scrot sent shadow \
+siji-git simplescreenrecorder speedcrunch sshfs st-luke-git swi-prolog \
+texlive-bin texlive-langchinese texlive-langcyrillic texlive-langgreek \
 texlive-langjapanese texlive-langkorean texlive-latexextra \
 texlive-localmanager-git texlive-most tmux tree ttf-arphic-uming ttf-baekmuk \
 ttf-bitstream-vera ttf-dejavu ttf-google-fonts-opinionated-git ttf-hanazono \
 ttf-joypixels ttf-koruri ttf-liberation ttf-material-design-icons-git \
 ttf-monapo ttf-mplus ttf-ms-fonts ttf-sazanami ttf-symbola ttf-tibetan-machine \
-ttf-twemoji-color ttf-unifont ttf-vlgothic typescript unicode unicode-emoji \
-unrar usbutils valgrind vscode-css-languageserver-bin \
-vscode-html-languageserver-bin w3m wget x11-ssh-askpass xclip \
-xdg-user-dirs-gtk xfsprogs xorg-apps xorg-drivers xorg-server xorg-xinit \
-xss-lock xvkbd yapf
+ttf-twemoji-color ttf-unifont ttf-vlgothic typescript \
+typescript-language-server-bin unicode unicode-emoji unrar usbutils valgrind \
+vscode-css-languageserver-bin vscode-html-languageserver-bin w3m wget \
+x11-ssh-askpass xclip xdg-user-dirs-gtk xfsprogs xorg-apps xorg-drivers \
+xorg-server xorg-xinit xss-lock xvkbd yaml-language-server-bin yapf
 
 printf "\n# Installing needed packages ##################################################\n\n"
 sudo pacman -Syu
@@ -229,6 +230,7 @@ go get -u -v github.com/josharian/impl
 go get -u -v github.com/mdempsky/gocode
 go get -u -v github.com/rogpeppe/godef
 go get -u -v github.com/zmb3/gogetdoc
+go get -u -v golang.org/x/tools/gopls
 
 chicken-install -s apropos chicken-doc
 
diff --git a/README.org b/README.org
index 579911f..8205fa1 100644
--- a/README.org
+++ b/README.org
@@ -701,7 +701,8 @@
     :END:
     Let’s set in a custom varible what packages we’ll be needing.
     #+BEGIN_SRC fish
-      set PACKAGES \
+      set PACKAGES
+
       acpilight adobe-source-han-sans-jp-fonts asar ascii aspell-en aspell-fr assimp \
       awesome-terminal-fonts base-devel bat biber bleachbit bluez-firmware \
       bluez-utils bookworm boost bzip2 ccls chicken chromium clisp compton cppcheck \
@@ -721,10 +722,10 @@
       pacman-contrib pandoc-bin pavucontrol pciutils pcurses pdfpc polybar prettier \
       pulseaudio-bluetooth python-autoflake python-envtpl-git python-epc \
       python-importmagic python-language-server python-nose python-pip python-ptvsd \
-      python-pytest python-pywal qemu r raw-thumbnailer reflector rofi \
-      rofi-wifi-menu-git rsync rtv rustup s-nail samba scrot sent shadow siji-git \
-      simplescreenrecorder speedcrunch sshfs st-luke-git swi-prolog texlive-bin \
-      texlive-langchinese texlive-langcyrillic texlive-langgreek \
+      python-pytest python-pywal qt5-imageformats qemu r raw-thumbnailer reflector \
+      rofi rofi-wifi-menu-git rsync rtv rustup s-nail samba scrot sent shadow \
+      siji-git simplescreenrecorder speedcrunch sshfs st-luke-git swi-prolog \
+      texlive-bin texlive-langchinese texlive-langcyrillic texlive-langgreek \
       texlive-langjapanese texlive-langkorean texlive-latexextra \
       texlive-localmanager-git texlive-most tmux tree ttf-arphic-uming ttf-baekmuk \
       ttf-bitstream-vera ttf-dejavu ttf-google-fonts-opinionated-git ttf-hanazono \