diff --git a/dot_config/environment.d/10-bascht.conf b/dot_config/environment.d/10-bascht.conf
index 90c2ef2..0b22e45 100644
--- a/dot_config/environment.d/10-bascht.conf
+++ b/dot_config/environment.d/10-bascht.conf
@@ -2,4 +2,5 @@ PATH=$HOME/.local/bin:$HOME/bin:$HOME/bin/go/bin:$HOME/.cargo/bin:$PATH
 DICPATH="${HOME}/.local/share/hunspell"
 XDG_CURRENT_DESKTOP=GNOME
 MOZ_ENABLE_WAYLAND=1
-MOZ_USE_XINPUT2=1
\ No newline at end of file
+MOZ_USE_XINPUT2=1
+EDITOR=vim
\ No newline at end of file
diff --git a/dot_config/sway/config b/dot_config/sway/config
index 3a37222..3fe6225 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -297,7 +297,6 @@ assign [instance="^.*\.yakshed\.org$"] "3: Comms"
 assign [title=".*slack.*"] "3: Comms"
 assign [instance="web.whatsapp.com"] "3: Comms"
 assign [instance="inoreader.com"] "3: Comms"
-assign [title="(?i).*qutebrowser-comms$"] "3: Comms"
 assign [instance="wire"] "3: Comms"
 assign [instance="signal"] "3: Comms"
 
@@ -336,7 +335,7 @@ mode "run" {
   bindsym b exec rofi-marks; mode "default"
   bindsym space exec sway-switch-window; mode "default";
 
-  bindsym w exec qutebrowser; mode "default";
+  bindsym w exec firefox; mode "default";
   bindsym $mod+w exec chromium-browser; mode "default";
 
   bindsym e exec em; mode "default"
diff --git a/executable_dot_zshenv b/executable_dot_zshenv
index dce37c0..dcce412 100755
--- a/executable_dot_zshenv
+++ b/executable_dot_zshenv
@@ -1,4 +1,5 @@
 source ~/.config/environment.d/*
+export EDITOR
 export PATH
 export DICPATH
 export XDG_CURRENT_DESKTOP