diff --git a/code-extensions.txt b/code-extensions.txt
index 75fd392..068d395 100644
--- a/code-extensions.txt
+++ b/code-extensions.txt
@@ -15,6 +15,8 @@ ms-azuretools.vscode-docker
 ms-python.python
 ms-python.vscode-pylance
 ms-toolsai.jupyter
+ms-toolsai.jupyter-keymap
+ms-toolsai.jupyter-renderers
 ms-vscode-remote.remote-ssh
 ms-vscode-remote.remote-ssh-edit
 ms-vscode.cpptools
diff --git a/pip-modules.txt b/pip-modules.txt
index fb6c9a1..e53f75f 100644
--- a/pip-modules.txt
+++ b/pip-modules.txt
@@ -2,82 +2,90 @@ alabaster==0.7.12
 apipkg==1.5
 appdirs==1.4.4
 arandr==0.1.10
-astroid==2.5.6
+argh==0.26.2
+astroid==2.6.2
 attrs==21.2.0
 Babel==2.9.1
 backcall==0.2.0
-btrfsutil==5.12.1
+borgbackup==1.1.17
+bsddb3==6.2.9
+btrfsutil==5.14.2
 CacheControl==0.12.6
 cairocffi==1.2.0
 certifi==2021.5.30
 cffi==1.14.6
 chardet==4.0.0
+charset-normalizer==2.0.3
 colorama==0.4.4
-contextlib2==0.6.0.post1
-cryptography==3.4.7
+contextlib2==21.6.0
+cryptography==35.0.0
 cupshelpers==1.0
 cycler==0.10.0
+debugpy==1.3.0
 decorator==5.0.9
-distlib==0.3.2
-distro==1.5.0
+distlib==0.3.3
+distro==1.6.0
 dnspython==2.1.0
 docopt==0.6.2
 docutils==0.17.1
 entrypoints==0.3
 evdev==1.4.0
-GDAL==3.3.0
-greenlet==1.1.0
+GDAL==3.3.1
+gramps==5.1.4
+greenlet==1.1.2
 gscreenshot==2.16.1
 html5lib==1.1
 idna==3.2
 imagesize==1.2.0
-importlib-metadata==4.5.0
+importlib-metadata==4.6.1
 iniconfig==1.1.1
-ipykernel==5.5.5
-ipython==7.24.1
+ipykernel==6.0.2
+ipython==7.25.0
 ipython-genutils==0.2.0
-isort==5.8.0
+isort==5.9.2
 jedi==0.18.0
-jeepney==0.7.0
+jeepney==0.7.1
 Jinja2==3.0.1
 jupyter-client==6.2.0
 jupyter-core==4.7.1
 keyring==23.0.1
 keyutils==0.6
-kiwisolver==1.3.1
+kiwisolver==1.3.2
 lazy-object-proxy==1.6.0
 lensfun==0.3.95
 lightdm-gtk-greeter-settings==1.2.2
-louis==3.18.0
-lutris==0.5.8.4
+louis==3.19.0
+lutris==0.5.9.1
 lxml==4.6.3
 Markdown==3.3.4
 MarkupSafe==2.0.1
 matplotlib==3.4.2
 matplotlib-inline==0.1.2
 mccabe==0.6.1
-meld==3.20.3
+meld==3.20.4
 more-itertools==8.8.0
 msgpack==1.0.2
 neovim-remote==2.4.0
 nest-asyncio==1.5.1
-numpy==1.20.3
+nordnm==0.8.1
+numpy==1.21.1
 ordered-set==4.0.2
 OWSLib==0.24.1
-packaging==20.9
+packaging==21.0
 parso==0.8.2
-pep517==0.10.0
+pathtools==0.1.2
+pep517==0.11.0
 pexpect==4.8.0
 pickleshare==0.7.5
-pikaur==1.7
-Pillow==8.2.0
-Pivy==0.6.5
+pikaur==1.8
+Pillow==8.3.1
+Pivy==0.6.6
 pluggy==0.13.1
 ply==3.11
 pockets==0.9.1
 powerline-shell==0.7.0
-progress==1.5
-prompt-toolkit==3.0.18
+progress==1.6
+prompt-toolkit==3.0.19
 psutil==5.8.0
 psycopg2==2.9.1
 ptyprocess==0.7.0
@@ -87,37 +95,39 @@ pyalpm==0.10.6
 pycairo==1.20.1
 pycparser==2.20
 pycups==2.0.1
-pycurl==7.43.0.6
+pycurl==7.44.1
 Pygments==2.9.0
 PyGObject==3.40.1
-pylint==2.8.3
+pylint==2.9.3
+pympress==1.6.1
 pynvim==0.4.3
 pyOpenSSL==20.0.1
 pyparsing==2.4.7
 pyproj==3.1.0
-PyQt5==5.15.4
+PyQt5==5.15.5
 PyQt5-sip==12.9.0
 pyserial==3.5
 PySide2==5.15.2
-pytest==6.2.4
-python-dateutil==2.8.1
+pytest==6.2.5
+python-dateutil==2.8.2
 python-magic==0.4.24
+python-vlc==3.0.12118
 pytz==2021.1
 PyYAML==5.4.1
 pyzmq==22.1.0
-QScintilla==2.13.0
-qtile==0.17.0
-requests==2.25.1
-resolvelib==0.7.0
+QScintilla==2.13.1
+qtile==0.18.0
+requests==2.26.0
+resolvelib==0.7.1
 retrying==1.3.3
-scipy==1.7.0
+scipy==1.7.1
 SecretStorage==3.3.1
 Shapely==1.7.1
 shiboken2==5.15.2
-sip==6.1.0
+sip==6.1.1
 six==1.16.0
 snowballstemmer==2.1.0
-Sphinx==4.0.2
+Sphinx==4.1.1
 sphinxcontrib-applehelp==1.0.2
 sphinxcontrib-devhelp==1.0.2
 sphinxcontrib-htmlhelp==2.0.0
@@ -127,15 +137,17 @@ sphinxcontrib-qthelp==1.0.3
 sphinxcontrib-serializinghtml==1.1.5
 team==1.0
 toml==0.10.2
+tomli==1.0.4
 tornado==6.1
 traitlets==5.0.5
-trimesh==3.9.20
+trimesh==3.9.23
 udiskie==2.3.3
-urllib3==1.26.6
+urllib3==1.26.7
+watchdog==0.10.7
 wcwidth==0.2.5
 webencodings==0.5.1
 wrapt==1.12.1
-wxPython==4.0.7.post2
+wxPython==4.1.1
 xcffib==0.11.1
 youtube-dl==2021.6.6
-zipp==3.5.0
+zipp==3.6.0
diff --git a/pkglist.txt b/pkglist.txt
index f8bf18b..97435e3 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -20,16 +20,19 @@ automake
 barrier
 base
 bdf-unifont
+biber
 binutils
 bison
 bitwarden-bin
 bitwarden-rofi
+borg
 capitaine-cursors
 cdrtools
 cmatrix
 cronie
 cups
 cura
+davfs2
 discord
 dnsmasq
 dosfstools
@@ -53,6 +56,8 @@ git
 gitg
 gnome-disk-utility
 gnome-keyring
+goocanvas
+gramps
 grub
 gruvbox-dark-icons-gtk
 gscreenshot
@@ -62,6 +67,7 @@ gvfs
 gvfs-smb
 htop
 inkscape
+jack2
 jre-openjdk
 jre8-openjdk
 kdeconnect
@@ -69,7 +75,20 @@ kdenlive
 kicad
 kicad-library
 kicad-library-3d
+lib32-giflib
+lib32-gnutls
+lib32-gst-plugins-base-libs
+lib32-gtk3
+lib32-libpulse
+lib32-libva
+lib32-libxcomposite
+lib32-libxinerama
+lib32-libxslt
+lib32-mpg123
 lib32-nvidia-utils
+lib32-ocl-icd
+lib32-openal
+lib32-v4l-utils
 libgnome-keyring
 libnotify
 libreoffice-still
@@ -80,6 +99,7 @@ lightdm-gtk-greeter-settings
 linux
 linux-firmware
 linux-lts
+linux-zen
 lshw
 lutris
 lxappearance
@@ -95,10 +115,12 @@ ncdu
 neofetch
 neovim
 nerd-fonts-complete
+network-manager-applet
 networkmanager
 nextcloud-client
 nitrogen
 nmap
+nordnm
 npm
 ntfs-3g
 numlockx
@@ -108,6 +130,7 @@ openmotif
 openocd
 openvpn
 os-prober
+osm-gps-map
 p3x-onenote
 p7zip
 pamixer
@@ -121,11 +144,13 @@ picom-jonaburg-git
 pikaur
 pkgconf
 playerctl
+playonlinux
 pulseaudio
 pulseaudio-alsa
 pulseaudio-ctl
 python-pip
 python-psutil
+python-pympress
 python-pynvim
 python-pytest
 python-subprocess2
@@ -142,9 +167,11 @@ rpi-imager
 shotwell
 signal-desktop
 skypeforlinux-stable-bin
+slack-desktop
 smbclient
 spacenavd
 spotify
+sshpass
 steam
 stlink
 stow
@@ -152,7 +179,9 @@ subversion
 sudo
 surf
 system-config-printer
+teams-for-linux
 teamviewer
+telegram-desktop
 texinfo
 texlive-bibtexextra
 texlive-core
@@ -189,7 +218,11 @@ wd719x-firmware
 wget
 whatsapp-for-linux
 which
-wine
+wine-gecko
+wine-mono
+wine-staging
+winetricks
+wireguard-tools
 woeusb-gui
 xarchiver
 xcb-util-cursor
diff --git a/screen-layout/.screenlayout/layout.sh b/screen-layout/.screenlayout/layout.sh
index 11bdd77..79a2eab 100755
--- a/screen-layout/.screenlayout/layout.sh
+++ b/screen-layout/.screenlayout/layout.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output DVI-I-0 --primary --mode 1440x900 --pos 2012x0 --rotate normal --output DVI-I-1 --off --output HDMI-0 --mode 1920x1080 --pos 0x660 --rotate left --output DP-0 --mode 3440x1440 --pos 1080x900 --rotate normal --output DP-1 --off --output DP-2 --off --output DP-3 --off --output DP-4 --off --output DP-5 --off
+xrandr --output DVI-I-0 --primary --mode 1440x900 --pos 2080x0 --rotate normal --output DVI-I-1 --off --output HDMI-0 --mode 1920x1080 --pos 0x660 --rotate left --output DP-0 --mode 3440x1440 --pos 1080x900 --rotate normal --output DP-1 --off --output DP-2 --off --output DP-3 --off --output DP-4 --off --output DP-5 --off
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a886e68..0e5633b 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -98,11 +98,13 @@ alias update-all="pikaur -Syu"              		# update standard pkgs and AUR pkg
 alias cleanup='sudo pacman -Rns $(pacman -Qtdq)' 	# remove orphaned packages
 
 # Changing "ls" to "exa"
-alias ls='exa -l --color=always --group-directories-first --git' # my preferred listing
-alias la='exa -a --color=always --group-directories-firs --git'  # all files and dirs
-alias ll='exa -al --color=always --group-directories-first --git'  # long format
-alias lt='exa -aT --color=always --group-directories-first --git' # tree listing
-alias l.='exa -a | egrep "^\."'
+alias ls='exa --icons -lF --color=always --group-directories-first --git' # my preferred listing
+alias la='exa --icons -aF --color=always --group-directories-first --git'  # all files and dirs
+alias ll='exa --icons -alF --color=always --group-directories-first --git'  # long format
+alias lt='exa --icons -aTF --color=always --group-directories-first --git' # tree listing
+alias lx='exa --icons -lF --color=always --group-directories-first --git --extended' # extended info
+alias l.='exa -a | egrep "^\."' # list dotfiles
+
 
 # Colorize grep output (good for log files)
 alias grep='grep --color=auto'