diff --git a/polybar/clock.py b/polybar/clock.py
index b600edf..0b27b49 100755
--- a/polybar/clock.py
+++ b/polybar/clock.py
@@ -50,8 +50,8 @@ try:
 
         localcolor = color_for(localnow)
 
-        khal_link = lambda x: "%{A1:i3-sensible-terminal -e khal interactive &:}" + x + "%{A}"
-        clock_link = lambda x, args: "%{A1:i3-sensible-terminal -e tty-clock -cC3 " + args + " &:}" + x + "%{A}"
+        khal_link = lambda x: "%{A1:i3-sensible-terminal -x khal interactive &:}" + x + "%{A}"
+        clock_link = lambda x, args: "%{A1:i3-sensible-terminal -x tty-clock -cC3 " + args + " &:}" + x + "%{A}"
 
         print(
             khal_link(
diff --git a/polybar/config.ini b/polybar/config.ini
index e3938b6..af283f7 100644
--- a/polybar/config.ini
+++ b/polybar/config.ini
@@ -229,7 +229,7 @@ card = intel_backlight
 type = internal/cpu
 interval = 3
 ;format-prefix = " "
-format = "%{A1:i3-sensible-terminal -e htop &:}<ramp-coreload>%{A}%{O-22}"
+format = "%{A1:i3-sensible-terminal -x htop &:}<ramp-coreload>%{A}%{O-22}"
 format-foreground = ${colors.foreground-alt}
 format-prefix-foreground = ${colors.foreground-alt}
 
@@ -261,7 +261,7 @@ type = internal/memory
 interval = 3
 format = "<label>"
 format-foreground = ${colors.foreground-alt}
-label = "%{A1:i3-sensible-terminal -e htop &:}%percentage_used:3%%{A}%{O-20}"
+label = "%{A1:i3-sensible-terminal -x htop &:}%percentage_used:3%%{A}%{O-20}"
 
 [module/temperature]
 type = internal/temperature
@@ -272,7 +272,7 @@ interval = 3
 units = false
 
 ;format = <ramp> <label>
-format = "%{A1:i3-sensible-terminal -e watch sensors &:}<label>%{A}"
+format = "%{A1:i3-sensible-terminal -x watch sensors &:}<label>%{A}"
 format-foreground = ${colors.foreground-alt}
 format-warn = %{T3}%{T-} <label-warn>
 format-warn-foreground = ${colors.foreground-alert}
@@ -298,11 +298,11 @@ interval = 3
 ; <ramp-signal>   show a signal strength icon
 ; This overlays the actual signal strength icon over the dark "full signal" icon
 ;format-connected = %{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>  <label-connected>
-format-connected = %{A:i3-sensible-terminal -e nmtui-connect:}%{A3:i3-sensible-terminal -e nmtui:}%{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>%{A}%{A}
+format-connected = %{A:i3-sensible-terminal -x nmtui-connect:}%{A3:i3-sensible-terminal -x nmtui:}%{T7}%{F#333}%{F}%{T-}%{O-18}<ramp-signal>%{A}%{A}
 format-connected-foreground = ${colors.foreground-alt}
 label-connected = %essid%
 
-format-disconnected = %{A1:i3-sensible-terminal -e nmtui-connect:}%{A3:i3-sensible-terminal -e nmtui:}<label-disconnected>%{A}%{A}
+format-disconnected = %{A1:i3-sensible-terminal -x nmtui-connect:}%{A3:i3-sensible-terminal -x nmtui:}<label-disconnected>%{A}%{A}
 label-disconnected = 
 label-disconnected-foreground = ${colors.foreground-alt}
 
diff --git a/xfce4-terminal/accels.scm b/xfce4-terminal/accels.scm
new file mode 100644
index 0000000..a1f46c0
--- /dev/null
+++ b/xfce4-terminal/accels.scm
@@ -0,0 +1,56 @@
+; xfce4-terminal GtkAccelMap rc-file         -*- scheme -*-
+; this file is an automated accelerator map dump
+;
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-4" "<Alt>4")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-3" "<Alt>3")
+; (gtk_accel_path "<Actions>/terminal-window/file-menu" "")
+; (gtk_accel_path "<Actions>/terminal-window/close-other-tabs" "")
+; (gtk_accel_path "<Actions>/terminal-window/search" "<Primary><Shift>f")
+; (gtk_accel_path "<Actions>/terminal-window/next-tab" "<Primary>Page_Down")
+; (gtk_accel_path "<Actions>/terminal-window/copy-html" "")
+; (gtk_accel_path "<Actions>/terminal-window/show-menubar" "")
+; (gtk_accel_path "<Actions>/terminal-window/zoom-reset" "<Primary>0")
+; (gtk_accel_path "<Actions>/terminal-window/close-window" "<Primary><Shift>q")
+; (gtk_accel_path "<Actions>/terminal-window/save-contents" "")
+; (gtk_accel_path "<Actions>/terminal-window/close-tab" "<Primary><Shift>w")
+; (gtk_accel_path "<Actions>/terminal-window/view-menu" "")
+; (gtk_accel_path "<Actions>/terminal-window/new-tab" "<Primary><Shift>t")
+; (gtk_accel_path "<Actions>/terminal-window/show-toolbar" "")
+; (gtk_accel_path "<Actions>/terminal-window/copy-input" "")
+; (gtk_accel_path "<Actions>/terminal-window/paste" "<Primary><Shift>v")
+; (gtk_accel_path "<Actions>/terminal-window/copy" "<Primary><Shift>c")
+; (gtk_accel_path "<Actions>/terminal-window/edit-menu" "")
+; (gtk_accel_path "<Actions>/terminal-window/fullscreen" "F11")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-1" "<Alt>1")
+; (gtk_accel_path "<Actions>/terminal-window/read-only" "")
+; (gtk_accel_path "<Actions>/terminal-window/detach-tab" "<Primary><Shift>d")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-8" "<Alt>8")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-2" "<Alt>2")
+; (gtk_accel_path "<Actions>/terminal-window/scroll-on-output" "")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-5" "<Alt>5")
+; (gtk_accel_path "<Actions>/terminal-window/prev-tab" "<Primary>Page_Up")
+; (gtk_accel_path "<Actions>/terminal-window/move-tab-left" "<Primary><Shift>Page_Up")
+; (gtk_accel_path "<Actions>/terminal-window/zoom-in" "<Primary>plus")
+; (gtk_accel_path "<Actions>/terminal-window/search-prev" "")
+; (gtk_accel_path "<Actions>/terminal-window/reset-and-clear" "")
+; (gtk_accel_path "<Actions>/terminal-window/about" "")
+; (gtk_accel_path "<Actions>/terminal-window/search-next" "")
+(gtk_accel_path "<Actions>/terminal-window/toggle-menubar" "F10")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-7" "<Alt>7")
+; (gtk_accel_path "<Actions>/terminal-window/select-all" "<Primary><Shift>a")
+; (gtk_accel_path "<Actions>/terminal-window/help-menu" "")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-9" "<Alt>9")
+; (gtk_accel_path "<Actions>/terminal-window/show-borders" "")
+; (gtk_accel_path "<Actions>/terminal-window/new-window" "<Primary><Shift>n")
+(gtk_accel_path "<Actions>/terminal-window/goto-tab-6" "<Alt>6")
+(gtk_accel_path "<Actions>/terminal-window/contents" "")
+; (gtk_accel_path "<Actions>/terminal-window/preferences" "")
+; (gtk_accel_path "<Actions>/terminal-window/move-tab-right" "<Primary><Shift>Page_Down")
+; (gtk_accel_path "<Actions>/terminal-window/zoom-out" "<Primary>minus")
+; (gtk_accel_path "<Actions>/terminal-window/set-title" "<Primary><Shift>s")
+; (gtk_accel_path "<Actions>/terminal-window/paste-selection" "")
+; (gtk_accel_path "<Actions>/terminal-window/undo-close-tab" "")
+; (gtk_accel_path "<Actions>/terminal-window/tabs-menu" "")
+; (gtk_accel_path "<Actions>/terminal-window/zoom-menu" "")
+; (gtk_accel_path "<Actions>/terminal-window/reset" "")
+; (gtk_accel_path "<Actions>/terminal-window/terminal-menu" "")
diff --git a/xfce4-terminal/terminalrc b/xfce4-terminal/terminalrc
new file mode 100644
index 0000000..4e8e321
--- /dev/null
+++ b/xfce4-terminal/terminalrc
@@ -0,0 +1,46 @@
+[Configuration]
+MiscAlwaysShowTabs=FALSE
+MiscBell=FALSE
+MiscBellUrgent=FALSE
+MiscBordersDefault=FALSE
+MiscCursorBlinks=FALSE
+MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
+MiscDefaultGeometry=80x24
+MiscInheritGeometry=FALSE
+MiscMenubarDefault=FALSE
+MiscMouseAutohide=FALSE
+MiscMouseWheelZoom=TRUE
+MiscToolbarDefault=FALSE
+MiscConfirmClose=TRUE
+MiscCycleTabs=TRUE
+MiscTabCloseButtons=TRUE
+MiscTabCloseMiddleClick=TRUE
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE
+MiscMiddleClickOpensUri=FALSE
+MiscCopyOnSelect=FALSE
+MiscDefaultWorkingDir=
+MiscRewrapOnResize=TRUE
+MiscUseShiftArrowsToScroll=FALSE
+MiscSlimTabs=TRUE
+CustomCommand=/usr/bin/zsh
+ScrollingOnOutput=FALSE
+FontName=Fira Code 13
+ColorPalette=rgb(63,63,63);rgb(210,74,74);rgb(96,180,138);rgb(223,175,143);rgb(154,184,215);rgb(220,140,195);rgb(140,208,211);rgb(235,235,235);rgb(85,87,83);rgb(215,120,120);rgb(114,213,163);rgb(240,223,175);rgb(148,191,243);rgb(236,147,211);rgb(147,224,227);rgb(255,255,255)
+ColorForeground=#f3f3f3f3f3f3
+ColorBackground=#000000000000
+ColorCursor=#dcdcdc
+BackgroundDarkness=0,800000
+WordChars=-A-Za-z0-9,./?%&#_=+@~
+BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT
+MiscShowRelaunchDialog=TRUE
+MiscNewTabAdjacent=FALSE
+ScrollingLines=18000
+TextBlinkMode=TERMINAL_TEXT_BLINK_MODE_FOCUSED
+ColorBoldIsBright=FALSE
+ScrollingBar=TERMINAL_SCROLLBAR_NONE
+TitleMode=TERMINAL_TITLE_REPLACE
+ShortcutsNoHelpkey=TRUE
+ShortcutsNoMnemonics=TRUE
+CellHeightScale=1,100000
+