diff --git a/tasks/git.yaml b/tasks/git.yaml
index b9d3f51..f62aaa5 100644
--- a/tasks/git.yaml
+++ b/tasks/git.yaml
@@ -6,3 +6,4 @@
     dest: ~/.gitconfig
   when:
     - git_user_email is defined
+    - git_user_name is defined
diff --git a/templates/git/gitconfig.j2 b/templates/git/gitconfig.j2
index 4c9391f..71286c6 100644
--- a/templates/git/gitconfig.j2
+++ b/templates/git/gitconfig.j2
@@ -1,5 +1,13 @@
 [user]
+{% if git_user_email is defined %}
 	email = {{git_user_email}}
+{% endif %}
+{% if git_user_name is defined %}
 	name = {{git_user_name}}
+{% endif %}
 [init]
 	defaultBranch = main
+{% if github_username is defined %}
+[github]
+	user = {{github_username}}
+{% endif %}
diff --git a/templates/i3/i3.config.j2 b/templates/i3/i3.config.j2
index 2e4c5c2..e2fb119 100644
--- a/templates/i3/i3.config.j2
+++ b/templates/i3/i3.config.j2
@@ -47,11 +47,13 @@ bindsym XF86HomePage exec {{default_browser}}
 bindsym XF86Calculator exec {{calculator_command}}
 
 ## Special modes
-bindsym $mod+less mode timer
+bindsym $mod+t mode timer
 bindsym $mod+s mode session
 bindsym $mod+c mode clipboard
 bindcode $mod+49 mode "remote"
 
+## Activity
+bindsym $mod+less exec "~/bin/timer select_activity"
 
 ## Applications
 bindsym $mod+Return exec "{{default_terminal}}"
@@ -118,7 +120,6 @@ bindsym $mod+KP_Add exec {{points_up_command}}
 # $mod+l
 # $mod+n
 # $mod+o
-# $mod+t
 # $mod+u
 # $mod+adiaeresis
 # $mod+odiaeresis
@@ -167,7 +168,10 @@ bindsym $mod+KP_Add exec {{points_up_command}}
 
   # Special modes
   bindcode $plexmod+49 mode "session"
-  bindsym $plexmod+less mode timer
+
+  # activity
+  bindsym $plexmod+less exec "~/bin/timer select_activity"
+
 {% endmacro %}
 {{ overall() }}