diff --git a/content/events.js b/content/events.js
index 18265794..4d6eaf46 100644
--- a/content/events.js
+++ b/content/events.js
@@ -479,7 +479,7 @@ function Events() //{{{
         {
             fullscreen = window.fullScreen;
             liberator.triggerObserver("fullscreen", fullscreen);
-            autocommands.trigger("Fullscreen", {url: "", fullscreen: fullscreen});
+            autocommands.trigger("Fullscreen", { state: fullscreen });
         }
     }
 
diff --git a/content/style.js b/content/style.js
index 0e658b11..7f1f3771 100644
--- a/content/style.js
+++ b/content/style.js
@@ -381,7 +381,7 @@ liberator.registerObserver("load_commands", function ()
             let scheme = args.arguments[0];
 
             if (io.sourceFromRuntimePath(["colors/" + scheme + ".vimp"]))
-                autocommands.trigger("ColorScheme", { colors: scheme }); // XXX: Best name?
+                autocommands.trigger("ColorScheme", { name: scheme });
             else
                 liberator.echoerr("E185: Cannot find color scheme " + scheme);
         },
diff --git a/locale/en-US/autocommands.txt b/locale/en-US/autocommands.txt
index aa662db5..203004e1 100644
--- a/locale/en-US/autocommands.txt
+++ b/locale/en-US/autocommands.txt
@@ -46,10 +46,10 @@ The following keywords are available where relevant:
 *<tags>*       The tags applied to <url>. Only for *BookmarkAdd*.
 *<keyword>*    The keywords applied to the bookmark. Only for *BookmarkAdd*.
 *<icon>*       The icon associated with <url>. Only for *BookmarkAdd*.
-*<size>*       The size of a downloaded file.
-*<file>*       The target destination of a download.
-*<fullscreen>* The new fullscreen state.
-*<colors>*     The color scheme name.
+*<size>*       The size of a downloaded file. Only for *DownloadPost*.
+*<file>*       The target destination of a download. Only for *DownloadPost*.
+*<state>*      The new fullscreen state. Only for *Fullscreen*.
+*<name>*       The color scheme name. Only for *ColorScheme*.
 --------------------------------------------------------------
 
 ________________________________________________________________________________