diff --git a/teledactyl/TODO b/teledactyl/TODO
index d7738ee1..3c8c498e 100644
--- a/teledactyl/TODO
+++ b/teledactyl/TODO
@@ -9,6 +9,7 @@ BUGS:
 - 'autoexternal' doesn't work
 
 FEATURES:
+9 check autocmd Events - which are applicable etc.
 9 edit messages with vim
 8 the archives need to be mailbox specific
   - currently it archives mail to the first Archive folder found
diff --git a/teledactyl/locale/en-US/autocommands.xml b/teledactyl/locale/en-US/autocommands.xml
index e6cbe3a8..54cbe21c 100644
--- a/teledactyl/locale/en-US/autocommands.xml
+++ b/teledactyl/locale/en-US/autocommands.xml
@@ -16,10 +16,9 @@
     <dt>PageLoadPre</dt>       <dd>Triggered after a page load is initiated</dd>
     <dt>PageLoad</dt>          <dd>Triggered when a page gets (re)loaded/opened</dd>
     <dt>ShellCmdPost</dt>      <dd>Triggered after executing a shell command with <ex>:!</ex><a>cmd</a></dd>
-    <dt>&dactyl.appName;Enter</dt>   <dd>Triggered after &dactyl.host; starts</dd>
-    <dt>&dactyl.appName;LeavePre</dt><dd>Triggered before exiting &dactyl.host;, just before destroying each module</dd>
-    <dt>&dactyl.appName;Leave</dt>   <dd>Triggered before exiting &dactyl.host;</dd>
-
+    <dt>Enter</dt>             <dd>Triggered after &dactyl.host; starts</dd>
+    <dt>LeavePre</dt>          <dd>Triggered before exiting &dactyl.host;, just before destroying each module</dd>
+    <dt>Leave</dt>             <dd>Triggered before exiting &dactyl.host;</dd>
     <dt>FolderLoad</dt>        <dd>Triggered after switching folders in &dactyl.host;</dd>
 </dl>