diff --git a/zshrc.org b/zshrc.org
index 0e7c37b..c8e509e 100644
--- a/zshrc.org
+++ b/zshrc.org
@@ -53,7 +53,7 @@ Each environment has slightly different setups, which will be tangled
 to different files according to the function `org-tags-to-filenames',
 defined in the previous section.
 
-*** Include                                                :daily:pi:android:
+*** Include                                                :daily:android:
 First, include a script that sets a number of confidential data (e.g. API keys and such)
 #+begin_src sh
   source ~/.config/confidential.sh
@@ -206,11 +206,11 @@ BIG FAT WARNING: this needs to specify an actual file as a destination
   }
 #+end_src
 
-*** emacs helpers                                                     :daily:
+*** emacs helpers                                                  :daily:pi:
 #+begin_src sh
   SOLARIZED="true"
-  export EMACS="/home/jacopods/.emacs.d/emacsclient-activities"
-
+  export EMACS="emacsclient"
+  export EMACS_DEF_ARGUMENTS="--alternate-editor=emacs"
   # Emacs stuff
   eca()
   {
@@ -219,28 +219,37 @@ BIG FAT WARNING: this needs to specify an actual file as a destination
       else
           EMACS_ARGUMENTS="-n"
       fi
-      $EMACS $EMACS_ARGUMENTS $@
-  }
-
-  magit() {
-      # TODO: add parameter just in case
-      eca -e "(magit-status \"$(pwd)\")"
-  }
-
-  μ() {
-      eca -e "(mu4e)"
-  }
-
-  bindkey -s '^X^G' 'magit\n'
-
-  agenda() {
-      # TODO: add parameter just in case
-      eca -e "(org-agenda-list)"
-  }
-
-  kill-emacs() {
-      eca -e "(kill-emacs)"
+      $EMACS $EMACS_DEF_ARGUMENTS $EMACS_ARGUMENTS $@
   }
+  #+end_src
+**** magit                                                         :daily:pi:
+  #+begin_src sh
+        magit() {
+            # TODO: add parameter just in case
+            eca -e "(magit-status \"$(pwd)\")"
+        }
+        bindkey -s '^X^G' 'magit\n'
+    #+end_src
+**** mu4e + agenda                                                    :daily:
+    #+begin_src sh
+
+        μ() {
+            eca -e "(mu4e)"
+        }
+
+        agenda() {
+            # TODO: add parameter just in case
+            eca -e "(org-agenda-list)"
+        }
+
+        kill-emacs() {
+            eca -e "(kill-emacs)"
+        }
+#+end_src
+**** specialized helper for the daily box                             :daily:
+#+begin_src sh
+  export EMACS="/home/jacopods/.emacs.d/emacsclient-activities"
+  export EMACS_DEF_ARGUMENTS=""
 
 #+end_src
 *** oh-my-zsh setup                                        :daily:pi:android: