diff --git a/config/darwin.nix b/config/darwin.nix
index bfae384..91737da 100644
--- a/config/darwin.nix
+++ b/config/darwin.nix
@@ -24,7 +24,6 @@
     casks = [
       "font-hack-nerd-font"
       "scroll-reverser"
-      "brave-browser"
       "instantview"
       "proton-mail"
       "flameshot"
@@ -32,6 +31,7 @@
       "bitwarden"
       "tailscale"
       "wireshark"
+      "firefox"
       "ghostty"
       "discord"
       "barrier"
diff --git a/dotfiles/.aerospace.toml b/dotfiles/.aerospace.toml
index c8049f6..d2f5abe 100644
--- a/dotfiles/.aerospace.toml
+++ b/dotfiles/.aerospace.toml
@@ -40,7 +40,7 @@ tell application "Ghostty"
 end tell
 EOF'''
 cmd-shift-e = 'exec-and-forget /etc/profiles/per-user/*/bin/emacs'
-cmd-shift-f = 'exec-and-forget open -n -a "Brave"'
+cmd-shift-f = 'exec-and-forget open -n -a "Firefox"'
 cmd-shift-d = 'exec-and-forget open -n -a "Discord"'
 
 # i3 wraps focus by default
diff --git a/dotfiles/.config/i3/config b/dotfiles/.config/i3/config
index 85c6991..16d1fd3 100644
--- a/dotfiles/.config/i3/config
+++ b/dotfiles/.config/i3/config
@@ -15,9 +15,9 @@ floating_modifier $mod
 
 # Application hot keys
 bindsym $mod+Return exec "alacritty"
-bindsym $mod+Shift+f exec "brave"
+bindsym $mod+Shift+f exec "firefox"
 bindsym $mod+Shift+e exec "emacsclient -c"
-bindsym $mod+Shift+d exec "discord"
+bindsym $mod+Shift+d exec "vesktop"
 bindsym $mod+Shift+t exec "thunar"
 bindsym $mod+Shift+s exec "flameshot gui"
 bindsym $mod+Shift+m exec "proton-mail"
diff --git a/home/modules/gui-apps.nix b/home/modules/gui-apps.nix
index 37e6e60..0b6c77a 100644
--- a/home/modules/gui-apps.nix
+++ b/home/modules/gui-apps.nix
@@ -3,10 +3,9 @@
     feh
     vlc
     dconf
-    brave
+    firefox
     vesktop
     zoom-us
-    discord
     twinkle
     audacity
     flameshot
@@ -46,11 +45,11 @@
   xdg.mimeApps = {
     enable = true;
     defaultApplications = {
-      "text/html" = "brave-browser.desktop";
-      "x-scheme-handler/http" = "brave-browser.desktop";
-      "x-scheme-handler/https" = "brave-browser.desktop";
-      "x-scheme-handler/about" = "brave-browser.desktop";
-      "x-scheme-handler/unknown" = "brave-browser.desktop";
+      "text/html" = ".desktop";
+      "x-scheme-handler/http" = "firefox.desktop";
+      "x-scheme-handler/https" = "firefox.desktop";
+      "x-scheme-handler/about" = "firefox.desktop";
+      "x-scheme-handler/unknown" = "firefox.desktop";
       "application/pdf" = "okularApplication_pdf.desktop";
       "text/plain" = "emacsclient.desktop";
     };