diff --git a/configs/alacritty.nix b/configs/alacritty.nix
index dae7b2a..902cd51 100644
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, config, ... }:
 {
-  niveum.applications.terminal = "alacritty";
+  environment.variables.TERMINAL = "alacritty";
 
   environment.systemPackages = [
     pkgs.unstable.alacritty
diff --git a/configs/default.nix b/configs/default.nix
index a4ee7e7..9d33aae 100644
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -63,7 +63,7 @@ in
       };
 
       niveum.applications = rec {
-        fileManager = "${config.niveum.applications.terminal} -e ${pkgs.ranger}/bin/ranger";
+        fileManager = "$TERMINAL -e ${pkgs.ranger}/bin/ranger";
       };
 
       niveum.theme = {
diff --git a/configs/i3.nix b/configs/i3.nix
index 0e4e796..108ef0c 100644
--- a/configs/i3.nix
+++ b/configs/i3.nix
@@ -72,7 +72,7 @@ in with config.niveum; {
       keybindings = {
         "${modifier}+Down" = "focus down";
         "${modifier}+Left" = "focus left";
-        "${modifier}+Return" = "exec ${applications.terminal}";
+        "${modifier}+Return" = "exec i3-sensible-terminal";
         "${modifier}+Right" = "focus right";
         "${modifier}+Shift+Down" = "move down";
         "${modifier}+Shift+Left" = "move left";
@@ -109,7 +109,7 @@ in with config.niveum; {
         "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -d 5";
         "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -t";
         "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamixer}/bin/pamixer -i 5";
-        "XF86Calculator" = "exec ${applications.terminal} -e ${pkgs.python3}/bin/python3";
+        "XF86Calculator" = "exec i3-sensible-terminal -e ${pkgs.python3}/bin/python3";
         "XF86ScreenSaver" = "exec ${pkgs.xautolock}/bin/xautolock -locknow";
         "XF86Display" = "exec ${pkgs.xcalib}/bin/xcalib -invert -alter";
         # XF86WakeUp (fn twice)
diff --git a/configs/rofi.nix b/configs/rofi.nix
index 7e50339..1bf96e9 100644
--- a/configs/rofi.nix
+++ b/configs/rofi.nix
@@ -4,7 +4,6 @@ with config.niveum; {
     enable = true;
     separator = "solid";
     scrollbar = false;
-    terminal = applications.terminal;
     borderWidth = 0;
     lines = 5;
     font = "Monospace ${toString (fonts.size + 1)}";