diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index 023d672..5946382 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -112,4 +112,7 @@ if ! shopt -oq posix; then
   fi
 fi
 
-PATH="${PATH}:~/.emacs.d/bin"
+PATH="${PATH}:~/.local/bin"
+export GTK_THEME=Adwaita:dark
+export XDG_CURRENT_DESKTOP=sway
+source "$HOME/.cargo/env"
diff --git a/dotfiles/.config/fish/config.fish b/dotfiles/.config/fish/config.fish
index 55dedb0..efc96fb 100644
--- a/dotfiles/.config/fish/config.fish
+++ b/dotfiles/.config/fish/config.fish
@@ -1,7 +1,10 @@
 alias ls='exa'
 alias caldav='vdirsyncer sync && khal interactive && vdirsyncer sync && true'
+alias mail='tmux new-session ";" source-file ~/.mutt/mail.tmux'
 set PATH $PATH ~/.local/bin
 set TERM xterm-256color
+set -x GTK_THEME Adwaita:dark
+set -x XDG_CURRENT_DESKTOP sway
 function fish_greeting
   status --is-login
   if [ $status != 0 ] 
diff --git a/setup.sh b/setup.sh
index 58cef43..2b91354 100644
--- a/setup.sh
+++ b/setup.sh
@@ -10,6 +10,7 @@ GREETDCONFIG="/etc/greetd/config.toml"
 GREETDENVS="/etc/greetd/environments"
 SWAYRUN="/usr/local/bin/sway-run.sh"
 WAYLAND_ENABLE="/usr/local/bin/wayland_enablement.sh"
+GTK_THEME=Adwaita:dark
 
 # Add my own repo
 wget -O - 'https://repo.mic.ke/PUBLIC.KEY' | sudo apt-key add -
@@ -62,8 +63,10 @@ sudo apt install \
     libncursesw5-dev \
     libpam-dev \
     libpam0g-dev \
+    libpipewire-0.3-dev \
     libpulse-dev \
     libssl-dev \
+    libsystemd-dev \
     libwayland-dev \
     libxcb-render0-dev \
     libxcb-shape0-dev \
@@ -219,6 +222,14 @@ cd ncspot
 cargo build --release
 sudo cp target/release/ncspot /usr/local/bin/
 
+# xdg-desktop-portal-wlr
+cd ~/sources
+git clone https://github.com/emersion/xdg-desktop-portal-wlr
+cd xdg-desktop-portal-wlr
+meson build
+ninja -C build
+sudo ninja -C build install
+
 # Vdirsyncer
 cd ~/sources
 git clone https://github.com/pimutils/vdirsyncer
@@ -253,6 +264,12 @@ sudo cp *tf /usr/local/share/fonts
 cd ..
 rm -rf fonts
 
+# Set up GTK_THEME
+grep GTK_THEME /etc/environment
+if [[$? != 0]];
+    echo "GTK_THEME=${GTK_THEME}" | sudo tee -a /etc/environment
+fi
+
 #lsd
 wget https://github.com/Peltoche/lsd/releases/download/0.19.0/lsd-musl_0.19.0_amd64.deb
 sudo dpkg -i lsd-musl_0.19.0_amd64.deb