diff --git a/luaa.c b/luaa.c
index 33823d34..402d0a17 100644
--- a/luaa.c
+++ b/luaa.c
@@ -817,9 +817,9 @@ luaA_init(xdgHandle* xdg)
     lua_setfield(L, 1, "path"); /* package.path = "concatenated string" */
     lua_pop(L, 1); /* pop "package" */
 
-    signal_add(&global_signals, "exit");
     signal_add(&global_signals, "debug::index::miss");
     signal_add(&global_signals, "debug::newindex::miss");
+    signal_add(&global_signals, "exit");
 }
 
 static bool
diff --git a/objects/button.c b/objects/button.c
index a7ec83bd..e5730ac5 100644
--- a/objects/button.c
+++ b/objects/button.c
@@ -126,9 +126,9 @@ button_class_setup(lua_State *L)
                             (lua_class_propfunc_t) luaA_button_get_modifiers,
                             (lua_class_propfunc_t) luaA_button_set_modifiers);
 
-    signal_add(&button_class.signals, "property::modifiers");
-    signal_add(&button_class.signals, "property::button");
     signal_add(&button_class.signals, "press");
+    signal_add(&button_class.signals, "property::button");
+    signal_add(&button_class.signals, "property::modifiers");
     signal_add(&button_class.signals, "release");
 }
 
diff --git a/objects/client.c b/objects/client.c
index dda79161..5686ca88 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -1877,52 +1877,52 @@ client_class_setup(lua_State *L)
                             NULL);
 
     signal_add(&client_class.signals, "focus");
-    signal_add(&client_class.signals, "unfocus");
-    signal_add(&client_class.signals, "manage");
-    signal_add(&client_class.signals, "unmanage");
     signal_add(&client_class.signals, "list");
-    signal_add(&client_class.signals, "tagged");
-    signal_add(&client_class.signals, "untagged");
+    signal_add(&client_class.signals, "manage");
+    signal_add(&client_class.signals, "mouse::enter");
+    signal_add(&client_class.signals, "mouse::leave");
+    signal_add(&client_class.signals, "property::above");
+    signal_add(&client_class.signals, "property::alt_icon_name");
+    signal_add(&client_class.signals, "property::alt_name");
+    signal_add(&client_class.signals, "property::below");
+    signal_add(&client_class.signals, "property::class");
+    signal_add(&client_class.signals, "property::fullscreen");
+    signal_add(&client_class.signals, "property::geometry");
+    signal_add(&client_class.signals, "property::group_window");
+    signal_add(&client_class.signals, "property::height");
+    signal_add(&client_class.signals, "property::hidden");
+    signal_add(&client_class.signals, "property::icon");
+    signal_add(&client_class.signals, "property::icon_name");
+    signal_add(&client_class.signals, "property::instance");
+    signal_add(&client_class.signals, "property::keys");
+    signal_add(&client_class.signals, "property::machine");
+    signal_add(&client_class.signals, "property::maximized_horizontal");
+    signal_add(&client_class.signals, "property::maximized_vertical");
+    signal_add(&client_class.signals, "property::minimized");
+    signal_add(&client_class.signals, "property::modal");
+    signal_add(&client_class.signals, "property::name");
+    signal_add(&client_class.signals, "property::ontop");
+    signal_add(&client_class.signals, "property::pid");
+    signal_add(&client_class.signals, "property::role");
     signal_add(&client_class.signals, "property::screen");
+    signal_add(&client_class.signals, "property::size_hints_honor");
+    signal_add(&client_class.signals, "property::skip_taskbar");
+    signal_add(&client_class.signals, "property::sticky");
     signal_add(&client_class.signals, "property::struts");
+    signal_add(&client_class.signals, "property::transient_for");
+    signal_add(&client_class.signals, "property::type");
+    signal_add(&client_class.signals, "property::urgent");
+    signal_add(&client_class.signals, "property::width");
     signal_add(&client_class.signals, "property::window");
     signal_add(&client_class.signals, "property::x");
     signal_add(&client_class.signals, "property::y");
-    signal_add(&client_class.signals, "property::width");
-    signal_add(&client_class.signals, "property::height");
-    signal_add(&client_class.signals, "property::geometry");
-    signal_add(&client_class.signals, "property::size_hints_honor");
-    signal_add(&client_class.signals, "property::group_window");
-    signal_add(&client_class.signals, "property::machine");
-    signal_add(&client_class.signals, "property::role");
-    signal_add(&client_class.signals, "property::alt_name");
-    signal_add(&client_class.signals, "property::name");
-    signal_add(&client_class.signals, "property::alt_icon_name");
-    signal_add(&client_class.signals, "property::icon_name");
-    signal_add(&client_class.signals, "property::pid");
-    signal_add(&client_class.signals, "property::class");
-    signal_add(&client_class.signals, "property::instance");
-    signal_add(&client_class.signals, "property::keys");
-    signal_add(&client_class.signals, "property::fullscreen");
-    signal_add(&client_class.signals, "property::maximized_horizontal");
-    signal_add(&client_class.signals, "property::maximized_vertical");
-    signal_add(&client_class.signals, "property::modal");
-    signal_add(&client_class.signals, "property::sticky");
-    signal_add(&client_class.signals, "property::above");
-    signal_add(&client_class.signals, "property::below");
-    signal_add(&client_class.signals, "property::ontop");
-    signal_add(&client_class.signals, "property::minimized");
-    signal_add(&client_class.signals, "property::urgent");
-    signal_add(&client_class.signals, "property::hidden");
-    signal_add(&client_class.signals, "property::icon");
-    signal_add(&client_class.signals, "property::skip_taskbar");
-    signal_add(&client_class.signals, "property::type");
-    signal_add(&client_class.signals, "property::transient_for");
     signal_add(&client_class.signals, "request::fullscreen");
     signal_add(&client_class.signals, "request::maximized_horizontal");
     signal_add(&client_class.signals, "request::maximized_vertical");
-    signal_add(&client_class.signals, "mouse::enter");
-    signal_add(&client_class.signals, "mouse::leave");
+    signal_add(&client_class.signals, "tagged");
+    signal_add(&client_class.signals, "unfocus");
+    signal_add(&client_class.signals, "unmanage");
+    signal_add(&client_class.signals, "untagged");
 }
 
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/objects/key.c b/objects/key.c
index aacedacf..8193994a 100644
--- a/objects/key.c
+++ b/objects/key.c
@@ -235,9 +235,9 @@ key_class_setup(lua_State *L)
                             (lua_class_propfunc_t) luaA_key_get_modifiers,
                             (lua_class_propfunc_t) luaA_key_set_modifiers);
 
-    signal_add(&key_class.signals, "property::modifiers");
-    signal_add(&key_class.signals, "property::key");
     signal_add(&key_class.signals, "press");
+    signal_add(&key_class.signals, "property::key");
+    signal_add(&key_class.signals, "property::modifiers");
     signal_add(&key_class.signals, "release");
 }
 
diff --git a/objects/wibox.c b/objects/wibox.c
index c6160a81..78434236 100644
--- a/objects/wibox.c
+++ b/objects/wibox.c
@@ -1283,24 +1283,24 @@ wibox_class_setup(lua_State *L)
                             (lua_class_propfunc_t) luaA_wibox_get_shape_clip,
                             (lua_class_propfunc_t) luaA_wibox_set_shape_clip);
 
-    signal_add(&wibox_class.signals, "property::border_width");
-    signal_add(&wibox_class.signals, "property::fg");
-    signal_add(&wibox_class.signals, "property::bg");
-    signal_add(&wibox_class.signals, "property::bg_image");
-    signal_add(&wibox_class.signals, "property::widgets");
-    signal_add(&wibox_class.signals, "property::x");
-    signal_add(&wibox_class.signals, "property::y");
-    signal_add(&wibox_class.signals, "property::width");
-    signal_add(&wibox_class.signals, "property::height");
-    signal_add(&wibox_class.signals, "property::ontop");
-    signal_add(&wibox_class.signals, "property::visible");
-    signal_add(&wibox_class.signals, "property::screen");
-    signal_add(&wibox_class.signals, "property::orientation");
-    signal_add(&wibox_class.signals, "property::cursor");
-    signal_add(&wibox_class.signals, "property::shape_bounding");
-    signal_add(&wibox_class.signals, "property::shape_clip");
     signal_add(&wibox_class.signals, "mouse::enter");
     signal_add(&wibox_class.signals, "mouse::leave");
+    signal_add(&wibox_class.signals, "property::bg");
+    signal_add(&wibox_class.signals, "property::bg_image");
+    signal_add(&wibox_class.signals, "property::border_width");
+    signal_add(&wibox_class.signals, "property::cursor");
+    signal_add(&wibox_class.signals, "property::fg");
+    signal_add(&wibox_class.signals, "property::height");
+    signal_add(&wibox_class.signals, "property::ontop");
+    signal_add(&wibox_class.signals, "property::orientation");
+    signal_add(&wibox_class.signals, "property::screen");
+    signal_add(&wibox_class.signals, "property::shape_bounding");
+    signal_add(&wibox_class.signals, "property::shape_clip");
+    signal_add(&wibox_class.signals, "property::visible");
+    signal_add(&wibox_class.signals, "property::widgets");
+    signal_add(&wibox_class.signals, "property::width");
+    signal_add(&wibox_class.signals, "property::x");
+    signal_add(&wibox_class.signals, "property::y");
 }
 
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/objects/widget.c b/objects/widget.c
index 32b4b643..564ede26 100644
--- a/objects/widget.c
+++ b/objects/widget.c
@@ -585,11 +585,11 @@ widget_class_setup(lua_State *L)
                             (lua_class_propfunc_t) luaA_widget_get_type,
                             NULL);
 
-    signal_add(&widget_class.signals, "property::type");
-    signal_add(&widget_class.signals, "property::buttons");
-    signal_add(&widget_class.signals, "property::visible");
     signal_add(&widget_class.signals, "mouse::enter");
     signal_add(&widget_class.signals, "mouse::leave");
+    signal_add(&widget_class.signals, "property::buttons");
+    signal_add(&widget_class.signals, "property::type");
+    signal_add(&widget_class.signals, "property::visible");
 }
 
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/objects/window.c b/objects/window.c
index 38e5a2f2..68acfb7c 100644
--- a/objects/window.c
+++ b/objects/window.c
@@ -230,8 +230,8 @@ window_class_setup(lua_State *L)
     signal_add(&window_class.signals, "property::border_color");
     signal_add(&window_class.signals, "property::border_width");
     signal_add(&window_class.signals, "property::buttons");
-    signal_add(&window_class.signals, "property::struts");
     signal_add(&window_class.signals, "property::opacity");
+    signal_add(&window_class.signals, "property::struts");
 }
 
 // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=80
diff --git a/screen.c b/screen.c
index 1dba889f..849b0658 100644
--- a/screen.c
+++ b/screen.c
@@ -75,9 +75,9 @@ screen_default_visual(xcb_screen_t *s)
 static void
 screen_add(screen_t new_screen)
 {
+    signal_add(&new_screen.signals, "property::workarea");
     signal_add(&new_screen.signals, "tag::attach");
     signal_add(&new_screen.signals, "tag::detach");
-    signal_add(&new_screen.signals, "property::workarea");
     screen_array_append(&globalconf.screens, new_screen);
 }
 
diff --git a/spawn.c b/spawn.c
index a058c8f0..8f6a1491 100644
--- a/spawn.c
+++ b/spawn.c
@@ -245,11 +245,11 @@ spawn_init(void)
                                                   spawn_monitor_event,
                                                   NULL, NULL);
 
-    signal_add(&global_signals, "spawn::timeout");
-    signal_add(&global_signals, "spawn::completed");
-    signal_add(&global_signals, "spawn::change");
-    signal_add(&global_signals, "spawn::initiated");
     signal_add(&global_signals, "spawn::canceled");
+    signal_add(&global_signals, "spawn::change");
+    signal_add(&global_signals, "spawn::completed");
+    signal_add(&global_signals, "spawn::initiated");
+    signal_add(&global_signals, "spawn::timeout");
 }
 
 static void