diff --git a/README.md b/README.md
index c9017d9..07a83b8 100644
--- a/README.md
+++ b/README.md
@@ -21,12 +21,12 @@ Applications
 **Desktop Environment**: XFCE
 **WM**: i3
 **LockScreen**: light-lock
-**Launcher**: Rofi
-**Browser**: Firefox
+**Launcher**: j4-dmenu-desktop
+**Browser**: firefox-esr
 **Development Environment**: Neovim
 **Document Viewer**: Atril
 **File Manager**: PCManFM
-**Music**: pragha
+**Music**: clementine
 **Video**: totem
 
 
@@ -43,11 +43,6 @@ Download the XFCE CD1 from: https://cdimage.debian.org/debian-cd/current/amd64/i
 
 ### Repositories Keys
 
-    wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | sudo apt-key add -
-    wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | sudo apt-key add -
-    wget -O- https://jgeboski.github.io/obs.key | sudo apt-key add -
-    wget -O- http://apt.metasploit.com/metasploit-framework.gpg.key | sudo apt-key add -
-    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 60EE47FBAD3DD469
     wget --quiet -O - https://insomnia.rest/keys/debian-public.key.asc | sudo apt-key add -
 
 
@@ -72,7 +67,7 @@ Select:
 ## SUDO
 
 ### Install sudo
-    aptitude install sudo gksu
+    aptitude install sudo
 
 ### Add Administrator to sudoers
     adduser {username} sudo
@@ -80,13 +75,7 @@ Select:
 ## Hardware
 
 ### Firmware
-    aptitude install firmware-linux intel-microcode amd64-microcode initramfs-tools firmware-amd-graphics
     aptitude install inotify-tools inotify-hookable sassc
-    dpkg --add-architecture i386
-
-### Wifi
-
-    aptitude install firmware-realtek firmware-iwlwifi
 
 ### Battery and Overheating
 
@@ -109,12 +98,6 @@ Select:
 
 `sudo aptitude install lm-sensors hddtemp psensor`
 
-### Disable bluetooth auto power-on
-
-Blueman automatically enables Bluetooth adapter when certain events (on boot, laptop lid is opened, ...) occur. This can be disabled with the auto-power-on in org.blueman.plugins.powermanager:
-
-    sudo gsettings set org.blueman.plugins.powermanager auto-power-on false
-
 ### Network
 
 Proper network manager with VPN support
@@ -137,10 +120,10 @@ Proper network manager with VPN support
 
 ### Storage
 
-* gnome-disks
+* gnome-disk-utility
 * gparted
 
-`sudo aptitude install gnome-disks gparted`
+`sudo aptitude install gnome-disk-utility gparted`
 
 ## Shell
 
@@ -183,10 +166,6 @@ Proper network manager with VPN support
     mkdir ~/.fonts
     wget -qO- http://plasmasturm.org/code/vistafonts-installer/vistafonts-installer | bash
 
-### Spotlight (unused)
-
-[Diogo's spotlight script](https://git.gnu.io/snippets/107)
-
 ### i3
 
 * [i3](https://blog.diogo.site/posts/i3wm)
@@ -228,9 +207,6 @@ Proper network manager with VPN support
 
 `sudo aptitude install pk-update-icon apt-config-auto-update`
 
-### Wine
-
-`sudo aptitude -t stretch-backports install wine`
 
 ## General Software
 
@@ -242,20 +218,19 @@ Proper network manager with VPN support
 * gimp
 * totem
 * handbrake
-* kdenlive
 * audacity
 * krita
 * blender
 * freecad
 * openscad
 
-`sudo aptitude install pavucontrol libavcodec-extra clementine gimp totem handbrake kdenlive audacity cmus`
+`sudo aptitude install pavucontrol libavcodec-extra clementine gimp totem handbrake audacity`
 
 ### Utilities
 
 * tmux
 * parcellite
-* qalculate
+* qalculate-gtk
 * gparted
 * simplescreenrecorder
 * kde-spectacle
@@ -266,25 +241,25 @@ Proper network manager with VPN support
 * redshift-gtk
 * seahorse
 
-`sudo aptitude install tmux parcellite qalculate gparted libreoffice simplescreenrecorder kde-spectacle gthumb engrampa arandr redshift-gtk seahorse`
+`sudo aptitude install tmux parcellite qalculate-gtk gthumb engrampa arandr seahorse`
 
 ### Programming
 
 * geany with [Darcula colorscheme](https://raw.githubusercontent.com/codebrainz/geany-themes/master/colorschemes/darcula.conf)
+* kate
 * git
 
-`sudo aptitude install geany git`
+`sudo aptitude install git geany kate`
 
 #### Neovim
 
 * `sudo aptitude purge vim-tiny`
 * `sudo aptitude install neovim`
 * `stow neovim tags-settings python javascript ruby`
-* `~/.config/nvim/installer/install.sh`
 
 ### Internet
 
-* `sudo aptitude install deluge firefox`
+* `sudo aptitude install qbittorrent`
 
 #### Chatting
 
diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf
old mode 100644
new mode 100755
index eec6691..73b6772
--- a/kitty/.config/kitty/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -9,7 +9,7 @@
 # bold_italic_font Operator Mono Medium
 # font_family      Input Mono
 # font_family      Fantasque Sans Mono
-# font_family      Hack
+font_family      Hack
 # font_family      Fira Code Retina
 italic_font      auto
 bold_font        auto
@@ -18,7 +18,7 @@ bold_italic_font auto
 # Font size (in pts)
 # font_size        18.0
 #font_size        12.0
-font_size             11
+font_size             10
 
 foreground            #959dcb
 background            #292d3e
@@ -242,7 +242,7 @@ macos_option_as_alt no
 # as #12af59 or "red".
 macos_titlebar_color background
 
-shell /bin/zsh
+shell /bin/bash
 close_on_child_death no
 allow_remote_control no
 term xterm-256color
diff --git a/latex/.latexmkrc b/latex/.latexmkrc
new file mode 100644
index 0000000..a4e84a7
--- /dev/null
+++ b/latex/.latexmkrc
@@ -0,0 +1,25 @@
+$pdflatex = 'xelatex --shell-escape -synctex=1 %O %S';
+
+# https://tex.stackexchange.com/questions/1226/how-to-make-latexmk-use-makeglossaries
+add_cus_dep('glo', 'gls', 0, 'run_makeglossaries');
+add_cus_dep('acn', 'acr', 0, 'run_makeglossaries');
+
+sub run_makeglossaries {
+    my ($base_name, $path) = fileparse( $_[0] ); #handle -outdir param by splitting path and file, ...
+    pushd $path; # ... cd-ing into folder first, then running makeglossaries ...
+
+    if ( $silent ) {
+        system "makeglossaries -q '$base_name'"; #unix
+        # system "makeglossaries", "-q", "$base_name"; #windows
+    }
+    else {
+        system "makeglossaries '$base_name'"; #unix
+        # system "makeglossaries", "$base_name"; #windows
+    };
+
+    popd; # ... and cd-ing back again
+}
+
+push @generated_exts, 'glo', 'gls', 'glg';
+push @generated_exts, 'acn', 'acr', 'alg';
+$clean_ext .= ' %R.ist %R.xdy';
diff --git a/shell/.profile b/shell/.profile
index d89ea5a..e9e40d7 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -25,3 +25,7 @@ fi
 if [ -d "$HOME/.local/bin" ] ; then
     PATH="$HOME/.local/bin:$PATH"
 fi
+
+if [ -d "$HOME/adb-fastboot/platform-tools" ] ; then
+ export PATH="$HOME/adb-fastboot/platform-tools:$PATH"
+fi
diff --git a/shell/.zshrc b/shell/.zshrc
index 4787ba1..d5f272f 100644
--- a/shell/.zshrc
+++ b/shell/.zshrc
@@ -45,7 +45,7 @@ kitty + complete setup zsh | source /dev/stdin
 
 # Theme: https://github.com/Stratus3D/dotfiles/blob/master/zsh/blinks-modified.zsh-theme
 
-# 
+#
 # https://github.com/blinks zsh theme
 
 # I have modified the blinks theme to make it more lightweight. There is no
@@ -94,3 +94,24 @@ fi
 unset __conda_setup
 # <<< conda initialize <<<
 
+# ROS 2
+source /opt/ros/humble/setup.zsh
+source /usr/share/colcon_argcomplete/hook/colcon-argcomplete.zsh
+
+mp4() {
+  if [ "$2" == "" ]; then
+    out="${1%.*}".mp4
+  else
+    out="$2"
+  fi
+  ffmpeg -i "$1" -crf 28 -movflags +faststart -c:v libx264 "$out"
+}
+
+gif() {
+  if [ "$2" == "" ]; then
+    out="${1%.*}".gif
+  else
+    out="$2"
+  fi
+  ffmpeg -i "$1" -vf "scale=320:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse" "$out"
+}