diff --git a/.config/Thunar/uca.xml b/.config/Thunar/uca.xml.cgt
similarity index 58%
rename from .config/Thunar/uca.xml
rename to .config/Thunar/uca.xml.cgt
index e5d6f16..9ab7366 100644
--- a/.config/Thunar/uca.xml
+++ b/.config/Thunar/uca.xml.cgt
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <actions>
 <action>
-	<icon>Alacritty</icon>
-	<name>Open Alacritty Here</name>
+    <icon><% opt.term.icon_name %></icon>
+    <name>Open <% opt.term.name %> Here</name>
 	<unique-id>1644418824525892-1</unique-id>
-	<command>alacritty --working-directory %f -e fish</command>
+    <command><% opt.term.workdir_command %> %f</command>
 	<description></description>
 	<patterns>*</patterns>
 	<startup-notify/>
diff --git a/.config/i3/config.cgt b/.config/i3/config.cgt
index e70be66..2317cd3 100644
--- a/.config/i3/config.cgt
+++ b/.config/i3/config.cgt
@@ -46,7 +46,7 @@ bindsym XF86Calculator exec qalculate-gtk
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec TERMINAL=<% opt.term_command %> i3-sensible-terminal
+bindsym $mod+Return exec TERMINAL=<% opt.term.command %> i3-sensible-terminal
 
 # open thunar
 bindsym $mod+Ctrl+e exec thunar
diff --git a/.config/river/init.cgt b/.config/river/init.cgt
index ba01a85..4c938d2 100755
--- a/.config/river/init.cgt
+++ b/.config/river/init.cgt
@@ -11,7 +11,7 @@
 # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
 
 # Super+Return to start a terminal
-riverctl map normal Super+Shift Return spawn <% opt.term_command %>
+riverctl map normal Super+Shift Return spawn <% opt.term.command %>
 
 # Super+Q to close the focused view
 riverctl map normal Super Q close
diff --git a/cg_opts.lua b/cg_opts.lua
index 413a432..6b91960 100644
--- a/cg_opts.lua
+++ b/cg_opts.lua
@@ -3,6 +3,11 @@ local opts = {}
 opts.font = "Iosevka Nerd Font"
 opts.term_font = "Iosevka Term Nerd Font Mono"
 
-opts.term_command = "wezterm"
+opts.term = {
+    name = "Wezterm",
+    command = "wezterm",
+    workdir_command = "wezterm-gui start --cwd",
+    icon_name = "org.wezfurlong.wezterm",
+}
 
 return opts