diff --git a/src/core/signal-registry-macros.h b/src/core/signal-registry-macros.h
index e12727ae..a0163617 100644
--- a/src/core/signal-registry-macros.h
+++ b/src/core/signal-registry-macros.h
@@ -6,41 +6,43 @@
    " " -> "_"
    "_" -> "__"
 */
-#define SIGNAL_REGISTER_FIX_NAME(VAR) {			\
-		char *i, *o ;				\
-		for (i = o = VAR; i; i++, o++) {	\
-			if (*i == '_') {		\
-				if (i[1] == '_') {	\
-					i++;		\
-					*o = '_';	\
-				} else {		\
-					*o = ' ';	\
-				}			\
-			} else {			\
-				*o = *i;		\
-			}				\
-		}					\
-		*o = '\0';				\
+inline static void signal_register_fix_name(char *var) {
+		char *i, *o ;
+		for (i = o = var; *i; i++, o++) {
+			if (*i == '_') {
+				if (i[1] == '_') {
+					i++;
+					*o = '_';
+				} else {
+					*o = ' ';
+				}
+			} else {
+				*o = *i;
+			}
+		}
+		*o = '\0';
 	}
 
 #define SIGNAL_REGISTER(SIGNAL, NUM, PROTO, ...)			\
-	inline static void signal_emit__ ## SIGNAL  PROTO  {		\
+	inline static int signal_emit__ ## SIGNAL  PROTO  {		\
 		static int SIGNAL ## _id;				\
 		if ( ! SIGNAL ## _id ) {				\
 			char signal_name[] = #SIGNAL ;			\
-			SIGNAL_REGISTER_FIX_NAME(signal_name);		\
+			signal_register_fix_name(signal_name);		\
 			SIGNAL ## _id = signal_get_uniq_id(signal_name); \
 		}							\
-		signal_emit_id(SIGNAL ## _id , NUM , ## __VA_ARGS__ );	\
+		return signal_emit_id_raw(SIGNAL ## _id , NUM , ## __VA_ARGS__ ); \
 	}								\
 
 #define SIGNAL_REGISTER_F(SIGNAL, NUM, PROTO, ARG, ...)			\
-	inline static void signal_emit__ ## SIGNAL ## _ PROTO  {	\
+	inline static int signal_emit__ ## SIGNAL ## _ PROTO  {	\
+		int ret;						\
 		char *signal_name, base_signal_name[] = #SIGNAL;	\
-		SIGNAL_REGISTER_FIX_NAME(base_signal_name);		\
+		signal_register_fix_name(base_signal_name);		\
 		signal_name = g_strconcat(base_signal_name, " ", ARG, NULL); \
-		signal_emit(signal_name , NUM , ## __VA_ARGS__ );	\
+		ret = signal_emit_raw(signal_name , NUM , ## __VA_ARGS__ ); \
 		g_free(signal_name);					\
+		return ret;						\
 	}								\
 
 
diff --git a/src/core/signal-registry.def b/src/core/signal-registry.def
index a001593b..09ae7ae2 100644
--- a/src/core/signal-registry.def
+++ b/src/core/signal-registry.def
@@ -46,16 +46,16 @@ SIGNAL_REGISTER(commandlist_remove, 1, (COMMAND_REC *command),
 	 command)
 SIGNAL_REGISTER(list_subcommands, 1, (const char *command),
 	 command)
-SIGNAL_REGISTER(error_command, 2, (int_in_ptr err, char *cmd),
+SIGNAL_REGISTER(error_command, 2, (int_in_ptr err, const char *cmd),
 	 err, cmd)
 
 SIGNAL_REGISTER(send_command, 3, (char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
 	 args, server, wi_item)
 SIGNAL_REGISTER(send_text, 3, (const char *line, SERVER_REC *server, WI_ITEM_REC *wi_item),
 	 line, server, wi_item)
-SIGNAL_REGISTER_F(command, 3, (const char *cmd, char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER_F(command, 3, (const char *cmd, const char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
 	 cmd, args, server, wi_item)
-SIGNAL_REGISTER(default_command, 3, (char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER(default_command, 3, (const char *args, SERVER_REC *server, WI_ITEM_REC *wi_item),
 	 args, server, wi_item)
 
 // chat-commands.c:
@@ -227,3 +227,6 @@ SIGNAL_REGISTER(settings_userinfo_changed, 1, (uint_in_ptr flags),
 SIGNAL_REGISTER(irssi_init_userinfo_changed, 1, (uint_in_ptr flags),
 	 flags)
  
+// expandos.c:
+SIGNAL_REGISTER(expando_timer, 0, (void))
+SIGNAL_REGISTER(time_changed, 0, (void))
\ No newline at end of file
diff --git a/src/core/signal-registry.def.in b/src/core/signal-registry.def.in
index cf4f7250..8bc5378c 100644
--- a/src/core/signal-registry.def.in
+++ b/src/core/signal-registry.def.in
@@ -28,12 +28,12 @@
  "commandlist new", COMMAND_REC
  "commandlist remove", COMMAND_REC
  "list subcommands", const char *command
- "error command", int err, char *cmd
+ "error command", int err, const char *cmd
 
  "send command", char *args, SERVER_REC, WI_ITEM_REC
  "send text", const char *line, SERVER_REC, WI_ITEM_REC
- "command "<cmd>, char *args, SERVER_REC, WI_ITEM_REC
- "default command", char *args, SERVER_REC, WI_ITEM_REC
+ "command "<cmd>, const char *args, SERVER_REC, WI_ITEM_REC
+ "default command", const char *args, SERVER_REC, WI_ITEM_REC
 
 // chat-commands.c:
  "chat protocol unknown", const char *protocol
@@ -135,3 +135,6 @@
  "settings userinfo changed", uint flags
  "irssi init userinfo changed", uint flags
  
+// expandos.c:
+ "expando timer"
+ "time changed"
\ No newline at end of file
diff --git a/src/core/signal-registry.h b/src/core/signal-registry.h
index f70be5ed..d06c86be 100644
--- a/src/core/signal-registry.h
+++ b/src/core/signal-registry.h
@@ -13,6 +13,16 @@ STYPE(TLS_REC);
 STYPE(CONFIG_REC);
 STYPE(SESSION_REC);
 STYPE(CONFIG_NODE);
+STYPE(CHAT_PROTOCOL_REC);
+STYPE(CHANNEL_REC);
+STYPE(QUERY_REC);
+STYPE(CHANNEL_SETUP_REC);
+STYPE(CHATNET_REC);
+STYPE(WI_ITEM_REC);
+STYPE(SERVER_REC);
+STYPE(SERVER_SETUP_REC);
+STYPE(SERVER_CONNECT_REC);
+STYPE(NICK_REC);
 typedef void *int_in_ptr;
 typedef void *uint_in_ptr;
 
diff --git a/src/fe-common/core/signal-registry.def b/src/fe-common/core/signal-registry.def
index 03b852b6..44965ede 100644
--- a/src/fe-common/core/signal-registry.def
+++ b/src/fe-common/core/signal-registry.def
@@ -1,154 +1,194 @@
 // FE common
 
-SIGNAL_REGISTER(gui_print_text, 6,
-	(WINDOW_REC *window, int_in_ptr fg, int_in_ptr bg, int_in_ptr flags, char *text, TEXT_DEST_REC *text_dest),
+SIGNAL_REGISTER(gui_print_text, 6, (WINDOW_REC *window, int_in_ptr fg, int_in_ptr bg, int_in_ptr flags, char *text, TEXT_DEST_REC *text_dest),
 	 window, fg, bg, flags, text, text_dest)
 
 // (Can be used to determine when all "gui print text"s are sent (not required)))
-SIGNAL_REGISTER(gui_print_text_finished, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(gui_print_text_finished, 1, (WINDOW_REC *window),
 	 window)
 
 // completion.c:
-SIGNAL_REGISTER(complete_word, 5,
-	(GList * of char*, WINDOW_REC *window, char *word, char *linestart, int_in_ptr *want_space),
-	GList * of char*, window, word, linestart, want_space)
+SIGNAL_REGISTER_F(complete_command, 5, (const char *cmd, GList **completions/*<char*>*/, WINDOW_REC *window, const char *word, char *linestart, int *want_space),
+	 cmd, completions, window, word, linestart, want_space)
+SIGNAL_REGISTER(complete_word, 5, (GList **completions/*<char*>*/, WINDOW_REC *window, const char *word, char *linestart, int *want_space),
+	 completions, window, word, linestart, want_space)
+SIGNAL_REGISTER(complete_erase, 3, (WINDOW_REC *window, const char *word, const char *linestart),
+	 window, word, linestart)
+SIGNAL_REGISTER_F(complete_erase_command, 3, (const char *cmd, WINDOW_REC *window, const char *word, const char *linestart),
+	 cmd, window, word, linestart)
+SIGNAL_REGISTER(completion_removed, 1, (const char *word),
+	 word)
+SIGNAL_REGISTER(completion_added, 1, (const char *word),
+	 word)
+ 
 
 // fe-common-core.c:
-SIGNAL_REGISTER(irssi_init_read_settings, 0,
-	(void))
+SIGNAL_REGISTER(irssi_init_read_settings, 0, (void))
+SIGNAL_REGISTER(irssi_init_finished, 0, (void))
 
+// fe-core-commands.c:
+SIGNAL_REGISTER(beep, 0, (void))
+ 
 // fe-exec.c:
-SIGNAL_REGISTER(exec_new, 1,
-	(PROCESS_REC *process),
+SIGNAL_REGISTER(exec_new, 1, (PROCESS_REC *process),
 	 process)
-SIGNAL_REGISTER(exec_remove, 2,
-	(PROCESS_REC *process, int_in_ptr status),
+SIGNAL_REGISTER(exec_remove, 2, (PROCESS_REC *process, int_in_ptr status),
 	 process, status)
-SIGNAL_REGISTER(exec_input, 2,
-	(PROCESS_REC *process, char *text),
+SIGNAL_REGISTER(exec_input, 2, (PROCESS_REC *process, char *text),
 	 process, text)
 
 // fe-messages.c:
-SIGNAL_REGISTER(message_public, 5,
-	(SERVER_REC *server, char *msg, char *nick, char *address, char *target),
+SIGNAL_REGISTER(message_public, 5, (SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target),
 	 server, msg, nick, address, target)
-SIGNAL_REGISTER(message_private, 5,
-	(SERVER_REC *server, char *msg, char *nick, char *address, char *target),
+SIGNAL_REGISTER(message_private, 5, (SERVER_REC *server, const char *msg, const char *nick, const char *address, const char *target),
 	 server, msg, nick, address, target)
-SIGNAL_REGISTER(message_join, 4,
-	(SERVER_REC *server, char *channel, char *nick, char *address),
+SIGNAL_REGISTER(message_join, 4, (SERVER_REC *server, const char *channel, const char *nick, const char *address),
 	 server, channel, nick, address)
-SIGNAL_REGISTER(message_part, 5,
-	(SERVER_REC *server, char *channel, char *nick, char *address, char *reason),
+SIGNAL_REGISTER(message_part, 5, (SERVER_REC *server, const char *channel, const char *nick, const char *address, char *reason),
 	 server, channel, nick, address, reason)
-SIGNAL_REGISTER(message_quit, 4,
-	(SERVER_REC *server, char *nick, char *address, char *reason),
+SIGNAL_REGISTER(message_quit, 4, (SERVER_REC *server, const char *nick, const char *address, char *reason),
 	 server, nick, address, reason)
-SIGNAL_REGISTER(message_kick, 6,
-	(SERVER_REC *server, char *channel, char *nick, char *kicker, char *address, char *reason),
+SIGNAL_REGISTER(message_kick, 6, (SERVER_REC *server, const char *channel, const char *nick, const char *kicker, const char *address, char *reason),
 	 server, channel, nick, kicker, address, reason)
-SIGNAL_REGISTER(message_nick, 4,
-	(SERVER_REC *server, char *newnick, char *oldnick, char *address),
+SIGNAL_REGISTER(message_nick, 4, (SERVER_REC *server, const char *newnick, const char *oldnick, const char *address),
 	 server, newnick, oldnick, address)
-SIGNAL_REGISTER(message_own__nick, 4,
-	(SERVER_REC *server, char *newnick, char *oldnick, char *address),
+SIGNAL_REGISTER(message_own__nick, 4, (SERVER_REC *server, const char *newnick, const char *oldnick, const char *address),
 	 server, newnick, oldnick, address)
-SIGNAL_REGISTER(message_invite, 4,
-	(SERVER_REC *server, char *channel, char *nick, char *address),
+SIGNAL_REGISTER(message_invite, 4, (SERVER_REC *server, const char *channel, const char *nick, const char *address),
 	 server, channel, nick, address)
-SIGNAL_REGISTER(message_topic, 5,
-	(SERVER_REC *server, char *channel, char *topic, char *nick, char *address),
+SIGNAL_REGISTER(message_topic, 5, (SERVER_REC *server, const char *channel, char *topic, const char *nick, const char *address),
 	 server, channel, topic, nick, address)
 
 // fe-log.c:
-SIGNAL_REGISTER(awaylog_show, 3,
-	(LOG_REC *log, int_in_ptr away_msgs, int_in_ptr filepos),
-	 log, away_msgs, filepos)
+
+// fe-channels.c:
+SIGNAL_REGISTER(channel_add_fill, 2, (CHANNEL_SETUP_REC *channel_setup, GHashTable *optlist),
+	 channel_setup, optlist)
+
+// fe-server.c:
+SIGNAL_REGISTER(server_add_fill, 2, (SERVER_SETUP_REC *server_setup, GHashTable *optlist),
+	 server_setup, optlist)
+
+// fe-settings.c:
+SIGNAL_REGISTER(alias_added, 2, (const char *alias, const char *value),
+	 alias, value)
+SIGNAL_REGISTER(alias_removed, 1, (const char *alias),
+	 alias)
 
 // keyboard.c:
-SIGNAL_REGISTER(keyinfo_created, 1,
-	(KEYINFO_REC *keyinfo),
+SIGNAL_REGISTER(keyinfo_created, 1, (KEYINFO_REC *keyinfo),
 	 keyinfo)
-SIGNAL_REGISTER(keyinfo_destroyed, 1,
-	(KEYINFO_REC *keyinfo),
+SIGNAL_REGISTER(keyinfo_destroyed, 1, (KEYINFO_REC *keyinfo),
 	 keyinfo)
+SIGNAL_REGISTER(keyboard_created, 1, (KEYBOARD_REC *keyboard),
+	 keyboard)
+SIGNAL_REGISTER(keyboard_destroyed, 1, (KEYBOARD_REC *keyboard),
+	 keyboard)
+SIGNAL_REGISTER(key_created, 1, (KEY_REC *key),
+	 key)
+SIGNAL_REGISTER(key_destroyed, 1, (KEY_REC *key),
+	 key)
+SIGNAL_REGISTER_F(key, 3, (const char *key, const char *data, void *gui_data, KEYINFO_REC *keyinfo),
+	 key, data, gui_data, keyinfo)
+SIGNAL_REGISTER(gui_entry_redirect, 4, (SIGNAL_FUNC func, const char *entry, int_in_ptr flags, void *data),
+	 func, entry, flags, data)
 
 // printtext.c:
-SIGNAL_REGISTER(print_text, 3,
-	(TEXT_DEST_REC *dest, char *text, char *stripped),
+SIGNAL_REGISTER(print_text, 3, (TEXT_DEST_REC *dest, const char *text, const char *stripped),
 	 dest, text, stripped)
+SIGNAL_REGISTER(print_starting, 1, (TEXT_DEST_REC *text_dest),
+	 text_dest)
+SIGNAL_REGISTER(print_format, 5, (THEME_REC *theme, const char *module, TEXT_DEST_REC *text_dest, int_in_ptr formatnum, char **arglist),
+	 theme, module, text_dest, formatnum, arglist)
 
 // themes.c:
-SIGNAL_REGISTER(theme_created, 1,
-	(THEME_REC *theme),
+SIGNAL_REGISTER(theme_created, 1, (THEME_REC *theme),
 	 theme)
-SIGNAL_REGISTER(theme_destroyed, 1,
-	(THEME_REC *theme),
+SIGNAL_REGISTER(theme_destroyed, 1, (THEME_REC *theme),
+	 theme)
+SIGNAL_REGISTER(theme_changed, 1, (THEME_REC *theme),
 	 theme)
 
+// hilight-text.c:
+SIGNAL_REGISTER(hilight_created, 1, (HILIGHT_REC *hilight),
+	 hilight)
+SIGNAL_REGISTER(hilight_destroyed, 1, (HILIGHT_REC *hilight),
+	 hilight)
+
 // window-activity.c:
-SIGNAL_REGISTER(window_hilight, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(window_hilight, 1, (WINDOW_REC *window),
 	 window)
-SIGNAL_REGISTER(window_hilight_check, 4,
-	(TEXT_DEST_REC *text_dest, char *msg, int_in_ptr *data_level, int_in_ptr *should_ignore),
+SIGNAL_REGISTER(window_hilight_check, 4, (TEXT_DEST_REC *text_dest, const char *msg, int *data_level, int *should_ignore),
 	 text_dest, msg, data_level, should_ignore)
-SIGNAL_REGISTER(window_dehilight, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(window_dehilight, 1, (WINDOW_REC *window),
 	 window)
-SIGNAL_REGISTER(window_activity, 2,
-	(WINDOW_REC *window, int_in_ptr old_level),
+SIGNAL_REGISTER(window_activity, 2, (WINDOW_REC *window, int_in_ptr old_level),
 	 window, old_level)
-SIGNAL_REGISTER(window_item_hilight, 1,
-	(WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER(window_item_hilight, 1, (WI_ITEM_REC *wi_item),
 	 wi_item)
-SIGNAL_REGISTER(window_item_activity, 2,
-	(WI_ITEM_REC *wi_item, int_in_ptr old_level),
+SIGNAL_REGISTER(window_item_activity, 2, (WI_ITEM_REC *wi_item, int_in_ptr old_level),
 	 wi_item, old_level)
 
 // window-items.c:
-SIGNAL_REGISTER(window_item_new, 2,
-	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER(window_item_new, 2, (WINDOW_REC *window, WI_ITEM_REC *wi_item),
 	 window, wi_item)
-SIGNAL_REGISTER(window_item_remove, 2,
-	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER(window_item_remove, 2, (WINDOW_REC *window, WI_ITEM_REC *wi_item),
 	 window, wi_item)
-SIGNAL_REGISTER(window_item_moved, 3,
-	(WINDOW_REC *window, WI_ITEM_REC *wi_item, WINDOW_REC *window),
-	 window, wi_item, window)
-SIGNAL_REGISTER(window_item_changed, 2,
-	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER(window_item_moved, 3, (WINDOW_REC *window, WI_ITEM_REC *wi_item, WINDOW_REC *window1),
+	 window, wi_item, window1)
+SIGNAL_REGISTER(window_item_changed, 2, (WINDOW_REC *window, WI_ITEM_REC *wi_item),
 	 window, wi_item)
-SIGNAL_REGISTER(window_item_server_changed, 2,
-	(WINDOW_REC *window, WI_ITEM_REC *wi_item),
+SIGNAL_REGISTER(window_item_server_changed, 2, (WINDOW_REC *window, WI_ITEM_REC *wi_item),
 	 window, wi_item)
 
 // windows.c:
-SIGNAL_REGISTER(window_created, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(window_created, 2, (WINDOW_REC *window, int_in_ptr automatic),
+	 window, automatic)
+SIGNAL_REGISTER(window_destroyed, 1, (WINDOW_REC *window),
 	 window)
-SIGNAL_REGISTER(window_destroyed, 1,
-	(WINDOW_REC *window),
-	 window)
-SIGNAL_REGISTER(window_changed, 2,
-	(WINDOW_REC *window, WINDOW_REC old),
+SIGNAL_REGISTER(window_changed, 2, (WINDOW_REC *window, WINDOW_REC *old),
 	 window, old)
-SIGNAL_REGISTER(window_changed_automatic, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(window_changed_automatic, 1, (WINDOW_REC *window),
 	 window)
-SIGNAL_REGISTER(window_server_changed, 2,
-	(WINDOW_REC *window, SERVER_REC *server),
+SIGNAL_REGISTER(window_server_changed, 2, (WINDOW_REC *window, SERVER_REC *server),
 	 window, server)
-SIGNAL_REGISTER(window_refnum_changed, 2,
-	(WINDOW_REC *window, int_in_ptr old),
+SIGNAL_REGISTER(window_refnum_changed, 2, (WINDOW_REC *window, int_in_ptr old),
 	 window, old)
-SIGNAL_REGISTER(window_name_changed, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(window_name_changed, 1, (WINDOW_REC *window),
 	 window)
-SIGNAL_REGISTER(window_history_changed, 2,
-	(WINDOW_REC *window, char *oldname),
+SIGNAL_REGISTER(window_history_changed, 2, (WINDOW_REC *window, char *oldname),
 	 window, oldname)
-SIGNAL_REGISTER(window_level_changed, 1,
-	(WINDOW_REC *window),
+SIGNAL_REGISTER(window_level_changed, 1, (WINDOW_REC *window),
 	 window)
+
+// window-commands.c:
+SIGNAL_REGISTER(window_print_info, 1, (WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(gui_window_create_override, 1, (int_in_ptr type),
+	 type)
+
+// windows-layout.c:
+SIGNAL_REGISTER(layout_save, 0, (void))
+SIGNAL_REGISTER(layout_save_item, 3, (WINDOW_REC *window, const char *type, CONFIG_NODE *node),
+	 window, type, node)
+SIGNAL_REGISTER(layout_save_window, 2, (WINDOW_REC *window, CONFIG_NODE *node),
+	 window, node)
+SIGNAL_REGISTER(layout_restore_item, 3, (WINDOW_REC *window, const char *type, CONFIG_NODE *node),
+	 window, type, node)
+SIGNAL_REGISTER(layout_restore_window, 2, (WINDOW_REC *window, CONFIG_NODE *node),
+	 window, node)
+SIGNAL_REGISTER(layout_restore, 0, (void))
+SIGNAL_REGISTER(layout_reset, 0, (void))
+
+// fe-windows.c:
+SIGNAL_REGISTER(window_connect_changed, 2, (WINDOW_REC *window, SERVER_REC *server),
+	 window, server)
+SIGNAL_REGISTER(window_history_cleared, 2, (WINDOW_REC *window, const char *name),
+	 window, name)
+SIGNAL_REGISTER(window_immortal_changed, 1, (WINDOW_REC *window),
+	 window)
+ 
+// fe-dcc.c:
+SIGNAL_REGISTER(dcc_list_print, 1, (DCC_REC *dcc),
+	 dcc)
+ 
\ No newline at end of file
diff --git a/src/fe-common/core/signal-registry.def.in b/src/fe-common/core/signal-registry.def.in
index 5909248d..8ecdaf63 100644
--- a/src/fe-common/core/signal-registry.def.in
+++ b/src/fe-common/core/signal-registry.def.in
@@ -6,45 +6,77 @@
  "gui print text finished", WINDOW_REC
 
 // completion.c:
- "complete word", GList * of char*, WINDOW_REC, char *word, char *linestart, int *want_space
+ "complete command "<cmd>, GList **completions/*<char*>*/, WINDOW_REC, const char *word, char *linestart, int *want_space
+ "complete word", GList **completions/*<char*>*/, WINDOW_REC, const char *word, char *linestart, int *want_space
+ "complete erase", WINDOW_REC, const char *word, const char *linestart
+ "complete erase command "<cmd>, WINDOW_REC, const char *word, const char *linestart
+ "completion removed", const char *word
+ "completion added", const char *word
+ 
 
 // fe-common-core.c:
  "irssi init read settings"
+ "irssi init finished"
 
+// fe-core-commands.c:
+ "beep"
+ 
 // fe-exec.c:
  "exec new", PROCESS_REC
  "exec remove", PROCESS_REC, int status
  "exec input", PROCESS_REC, char *text
 
 // fe-messages.c:
- "message public", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message private", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message join", SERVER_REC, char *channel, char *nick, char *address
- "message part", SERVER_REC, char *channel, char *nick, char *address, char *reason
- "message quit", SERVER_REC, char *nick, char *address, char *reason
- "message kick", SERVER_REC, char *channel, char *nick, char *kicker, char *address, char *reason
- "message nick", SERVER_REC, char *newnick, char *oldnick, char *address
- "message own_nick", SERVER_REC, char *newnick, char *oldnick, char *address
- "message invite", SERVER_REC, char *channel, char *nick, char *address
- "message topic", SERVER_REC, char *channel, char *topic, char *nick, char *address
+ "message public", SERVER_REC, const char *msg, const char *nick, const char *address, const char *target
+ "message private", SERVER_REC, const char *msg, const char *nick, const char *address, const char *target
+ "message join", SERVER_REC, const char *channel, const char *nick, const char *address
+ "message part", SERVER_REC, const char *channel, const char *nick, const char *address, char *reason
+ "message quit", SERVER_REC, const char *nick, const char *address, char *reason
+ "message kick", SERVER_REC, const char *channel, const char *nick, const char *kicker, const char *address, char *reason
+ "message nick", SERVER_REC, const char *newnick, const char *oldnick, const char *address
+ "message own_nick", SERVER_REC, const char *newnick, const char *oldnick, const char *address
+ "message invite", SERVER_REC, const char *channel, const char *nick, const char *address
+ "message topic", SERVER_REC, const char *channel, char *topic, const char *nick, const char *address
 
 // fe-log.c:
- "awaylog show", LOG_REC, int away_msgs, int filepos
+
+// fe-channels.c:
+ "channel add fill", CHANNEL_SETUP_REC, GHashTable *optlist
+
+// fe-server.c:
+ "server add fill", SERVER_SETUP_REC, GHashTable *optlist
+
+// fe-settings.c:
+ "alias added", const char *alias, const char *value
+ "alias removed", const char *alias
 
 // keyboard.c:
  "keyinfo created", KEYINFO_REC
  "keyinfo destroyed", KEYINFO_REC
+ "keyboard created", KEYBOARD_REC
+ "keyboard destroyed", KEYBOARD_REC
+ "key created", KEY_REC
+ "key destroyed", KEY_REC
+ "key "<key>, const char *data, void *gui_data, KEYINFO_REC
+ "gui entry redirect", SIGNAL_FUNC func, const char *entry, int flags, void *data
 
 // printtext.c:
- "print text", TEXT_DEST_REC *dest, char *text, char *stripped
+ "print text", TEXT_DEST_REC *dest, const char *text, const char *stripped
+ "print starting", TEXT_DEST_REC
+ "print format", THEME_REC, const char *module, TEXT_DEST_REC, int formatnum, char **arglist
 
 // themes.c:
  "theme created", THEME_REC
  "theme destroyed", THEME_REC
+ "theme changed", THEME_REC
+
+// hilight-text.c:
+ "hilight created", HILIGHT_REC
+ "hilight destroyed", HILIGHT_REC
 
 // window-activity.c:
  "window hilight", WINDOW_REC
- "window hilight check", TEXT_DEST_REC, char *msg, int *data_level, int *should_ignore
+ "window hilight check", TEXT_DEST_REC, const char *msg, int *data_level, int *should_ignore
  "window dehilight", WINDOW_REC
  "window activity", WINDOW_REC, int old_level
  "window item hilight", WI_ITEM_REC
@@ -58,12 +90,34 @@
  "window item server changed", WINDOW_REC, WI_ITEM_REC
 
 // windows.c:
- "window created", WINDOW_REC
+ "window created", WINDOW_REC, int automatic
  "window destroyed", WINDOW_REC
- "window changed", WINDOW_REC, WINDOW_REC old
+ "window changed", WINDOW_REC, WINDOW_REC *old
  "window changed automatic", WINDOW_REC
  "window server changed", WINDOW_REC, SERVER_REC
  "window refnum changed", WINDOW_REC, int old
  "window name changed", WINDOW_REC
  "window history changed", WINDOW_REC, char *oldname
  "window level changed", WINDOW_REC
+
+// window-commands.c:
+ "window print info", WINDOW_REC
+ "gui window create override", int type
+
+// windows-layout.c:
+ "layout save"
+ "layout save item", WINDOW_REC, const char *type, CONFIG_NODE
+ "layout save window", WINDOW_REC, CONFIG_NODE
+ "layout restore item", WINDOW_REC, const char *type, CONFIG_NODE
+ "layout restore window", WINDOW_REC, CONFIG_NODE
+ "layout restore"
+ "layout reset"
+
+// fe-windows.c:
+ "window connect changed", WINDOW_REC, SERVER_REC
+ "window history cleared", WINDOW_REC, const char *name
+ "window immortal changed", WINDOW_REC
+ 
+// fe-dcc.c:
+ "dcc list print", DCC_REC
+ 
\ No newline at end of file
diff --git a/src/fe-common/core/signal-registry.h b/src/fe-common/core/signal-registry.h
index 1c823e94..7b6dead7 100644
--- a/src/fe-common/core/signal-registry.h
+++ b/src/fe-common/core/signal-registry.h
@@ -4,6 +4,15 @@
 #include "modules.h"
 #include "signal-registry-macros.h"
 
+typedef struct PROCESS_REC PROCESS_REC;
+STYPE(KEYINFO_REC);
+STYPE(TEXT_DEST_REC);
+STYPE(THEME_REC);
+STYPE(HILIGHT_REC);
+STYPE(KEYBOARD_REC);
+STYPE(KEY_REC);
+STYPE(DCC_REC);
+STYPE(CONFIG_NODE);
 
 #include "signal-registry.def"
 
diff --git a/src/fe-common/irc/signal-registry.def b/src/fe-common/irc/signal-registry.def
index 397e01d5..4cfc798d 100644
--- a/src/fe-common/irc/signal-registry.def
+++ b/src/fe-common/irc/signal-registry.def
@@ -1,25 +1,41 @@
 // FE IRC
 
 // fe-events.c:
- "default event numeric", SERVER_REC, char *data, char *nick, char *address
+SIGNAL_REGISTER(default_event_numeric, 4, (SERVER_REC *server, const char *data, const char *nick, const char *address),
+	 server, data, nick, address)
 
 // fe-irc-messages.c:
- "message irc op_public", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message irc own_wall", SERVER_REC, char *msg, char *target
- "message irc own_action", SERVER_REC, char *msg, char *target
- "message irc action", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message irc own_notice", SERVER_REC, char *msg, char *target
- "message irc notice", SERVER_REC, char *msg, char *nick, char *address, char *target
- "message irc own_ctcp", SERVER_REC, char *cmd, char *data, char *target
- "message irc ctcp", SERVER_REC, char *cmd, char *data, char *nick, char *address, char *target
+SIGNAL_REGISTER(message_irc_op__public, 5, (IRC_SERVER_REC *irc_server, char *msg, const char *nick, const char *address, const char *target),
+	 irc_server, msg, nick, address, target)
+SIGNAL_REGISTER(message_irc_own__wall, 3, (IRC_SERVER_REC *irc_server, const char *msg, const char *target),
+	 irc_server, msg, target)
+SIGNAL_REGISTER(message_irc_own__action, 3, (IRC_SERVER_REC *irc_server, const char *msg, const char *target),
+	 irc_server, msg, target)
+SIGNAL_REGISTER(message_irc_action, 5, (IRC_SERVER_REC *irc_server, char *msg, const char *nick, const char *address, const char *target),
+	 irc_server, msg, nick, address, target)
+SIGNAL_REGISTER(message_irc_own__notice, 3, (IRC_SERVER_REC *irc_server, const char *msg, const char *target),
+	 irc_server, msg, target)
+SIGNAL_REGISTER(message_irc_notice, 5, (IRC_SERVER_REC *irc_server, char *msg, const char *nick, const char *address, const char *target),
+	 irc_server, msg, nick, address, target)
+SIGNAL_REGISTER(message_irc_own__ctcp, 4, (IRC_SERVER_REC *irc_server, char *cmd, char *data, const char *target),
+	 irc_server, cmd, data, target)
+SIGNAL_REGISTER(message_irc_ctcp, 6, (IRC_SERVER_REC *irc_server, char *cmd, const char *data, const char *nick, const char *address, const char *target),
+	 irc_server, cmd, data, nick, address, target)
 
 // fe-modes.c:
- "message irc mode", SERVER_REC, char *channel, char *nick, char *addr, char *mode
+SIGNAL_REGISTER(message_irc_mode, 5, (IRC_SERVER_REC *irc_server, const char *channel, const char *nick, const char *addr, char *mode),
+	 irc_server, channel, nick, addr, mode)
 
 // dcc/fe-dcc-chat-messages.c:
- "message dcc own", DCC_REC *dcc, char *msg
- "message dcc own_action", DCC_REC *dcc, char *msg
- "message dcc own_ctcp", DCC_REC *dcc, char *cmd, char *data
- "message dcc", DCC_REC *dcc, char *msg
- "message dcc action", DCC_REC *dcc, char *msg
- "message dcc ctcp", DCC_REC *dcc, char *cmd, char *data
+SIGNAL_REGISTER(message_dcc_own, 2, (CHAT_DCC_REC *dcc, const char *msg),
+	 dcc, msg)
+SIGNAL_REGISTER(message_dcc_own__action, 2, (CHAT_DCC_REC *dcc, const char *msg),
+	 dcc, msg)
+SIGNAL_REGISTER(message_dcc_own__ctcp, 3, (CHAT_DCC_REC *dcc, const char *cmd, const char *data),
+	 dcc, cmd, data)
+SIGNAL_REGISTER(message_dcc, 2, (CHAT_DCC_REC *dcc, const char *msg),
+	 dcc, msg)
+SIGNAL_REGISTER(message_dcc_action, 2, (CHAT_DCC_REC *dcc, const char *msg),
+	 dcc, msg)
+SIGNAL_REGISTER(message_dcc_ctcp, 3, (CHAT_DCC_REC *dcc, const char *cmd, const char *data),
+	 dcc, cmd, data)
diff --git a/src/fe-common/irc/signal-registry.def.in b/src/fe-common/irc/signal-registry.def.in
new file mode 100644
index 00000000..4b5e61c4
--- /dev/null
+++ b/src/fe-common/irc/signal-registry.def.in
@@ -0,0 +1,25 @@
+// FE IRC
+
+// fe-events.c:
+ "default event numeric", SERVER_REC, const char *data, const char *nick, const char *address
+
+// fe-irc-messages.c:
+ "message irc op_public", IRC_SERVER_REC, char *msg, const char *nick, const char *address, const char *target
+ "message irc own_wall", IRC_SERVER_REC, const char *msg, const char *target
+ "message irc own_action", IRC_SERVER_REC, const char *msg, const char *target
+ "message irc action", IRC_SERVER_REC, char *msg, const char *nick, const char *address, const char *target
+ "message irc own_notice", IRC_SERVER_REC, const char *msg, const char *target
+ "message irc notice", IRC_SERVER_REC, char *msg, const char *nick, const char *address, const char *target
+ "message irc own_ctcp", IRC_SERVER_REC, char *cmd, char *data, const char *target
+ "message irc ctcp", IRC_SERVER_REC, char *cmd, const char *data, const char *nick, const char *address, const char *target
+
+// fe-modes.c:
+ "message irc mode", IRC_SERVER_REC, const char *channel, const char *nick, const char *addr, char *mode
+
+// dcc/fe-dcc-chat-messages.c:
+ "message dcc own", CHAT_DCC_REC *dcc, const char *msg
+ "message dcc own_action", CHAT_DCC_REC *dcc, const char *msg
+ "message dcc own_ctcp", CHAT_DCC_REC *dcc, const char *cmd, const char *data
+ "message dcc", CHAT_DCC_REC *dcc, const char *msg
+ "message dcc action", CHAT_DCC_REC *dcc, const char *msg
+ "message dcc ctcp", CHAT_DCC_REC *dcc, const char *cmd, const char *data
diff --git a/src/fe-common/irc/signal-registry.h b/src/fe-common/irc/signal-registry.h
new file mode 100644
index 00000000..01398a5e
--- /dev/null
+++ b/src/fe-common/irc/signal-registry.h
@@ -0,0 +1,12 @@
+#ifndef IRSSI_FE_COMMON_IRC_SIGNAL_REGISTRY_H
+#define IRSSI_FE_COMMON_IRC_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+STYPE(IRC_SERVER_REC);
+typedef struct CHAT_DCC_REC CHAT_DCC_REC;
+
+#include "signal-registry.def"
+
+#endif
diff --git a/src/fe-text/signal-registry.def b/src/fe-text/signal-registry.def
index 8e483804..1b67bbf4 100644
--- a/src/fe-text/signal-registry.def
+++ b/src/fe-text/signal-registry.def
@@ -1,11 +1,43 @@
 // Text FE
 
 // gui-readline.c:
- "gui key pressed", int key
+SIGNAL_REGISTER(gui_key_pressed, 1, (int_in_ptr key),
+	 key)
 
 // gui-printtext.c:
- "beep"
- "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line
+SIGNAL_REGISTER(gui_print_text_after_finished, 3, (WINDOW_REC *window, LINE_REC *line, LINE_REC *prev_line),
+	 window, line, prev_line)
 
 // textbuffer-view.c
- "gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line
+SIGNAL_REGISTER(gui_textbuffer_line_removed, 3, (TEXT_BUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line),
+	 view, line, prev_line)
+
+// gui-windows.c:
+SIGNAL_REGISTER(gui_window_created, 1, (WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(gui_window_destroyed, 1, (WINDOW_REC *window),
+	 window)
+SIGNAL_REGISTER(gui_page_scrolled, 1, (WINDOW_REC *window),
+	 window)
+
+// mainwindows.c:
+SIGNAL_REGISTER(mainwindow_created, 1, (MAIN_WINDOW_REC *main_window),
+	 main_window)
+SIGNAL_REGISTER(mainwindow_resized, 1, (MAIN_WINDOW_REC *main_window),
+	 main_window)
+SIGNAL_REGISTER(mainwindow_moved, 1, (MAIN_WINDOW_REC *main_window),
+	 main_window)
+SIGNAL_REGISTER(mainwindow_destroyed, 1, (MAIN_WINDOW_REC *main_window),
+	 main_window)
+SIGNAL_REGISTER(terminal_resized, 0, (void))
+
+// statusbar.c:
+SIGNAL_REGISTER(statusbar_created, 1, (STATUSBAR_REC *statusbar),
+	 statusbar)
+SIGNAL_REGISTER(statusbar_destroyed, 1, (STATUSBAR_REC *statusbar),
+	 statusbar)
+SIGNAL_REGISTER(statusbar_item_created, 1, (SBAR_ITEM_REC *sbar_item),
+	 sbar_item)
+SIGNAL_REGISTER(statusbar_item_destroyed, 1, (SBAR_ITEM_REC *sbar_item),
+	 sbar_item)
+ 
\ No newline at end of file
diff --git a/src/fe-text/signal-registry.def.in b/src/fe-text/signal-registry.def.in
new file mode 100644
index 00000000..5014ac6e
--- /dev/null
+++ b/src/fe-text/signal-registry.def.in
@@ -0,0 +1,29 @@
+// Text FE
+
+// gui-readline.c:
+ "gui key pressed", int key
+
+// gui-printtext.c:
+ "gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line
+
+// textbuffer-view.c
+ "gui textbuffer line removed", TEXT_BUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line
+
+// gui-windows.c:
+ "gui window created", WINDOW_REC
+ "gui window destroyed", WINDOW_REC
+ "gui page scrolled", WINDOW_REC
+
+// mainwindows.c:
+ "mainwindow created", MAIN_WINDOW_REC
+ "mainwindow resized", MAIN_WINDOW_REC
+ "mainwindow moved", MAIN_WINDOW_REC
+ "mainwindow destroyed", MAIN_WINDOW_REC
+ "terminal resized"
+
+// statusbar.c:
+ "statusbar created", STATUSBAR_REC
+ "statusbar destroyed", STATUSBAR_REC
+ "statusbar item created", SBAR_ITEM_REC
+ "statusbar item destroyed", SBAR_ITEM_REC
+ 
\ No newline at end of file
diff --git a/src/fe-text/signal-registry.h b/src/fe-text/signal-registry.h
new file mode 100644
index 00000000..0b049168
--- /dev/null
+++ b/src/fe-text/signal-registry.h
@@ -0,0 +1,15 @@
+#ifndef IRSSI_FE_TEXT_SIGNAL_REGISTRY_H
+#define IRSSI_FE_TEXT_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+STYPE(LINE_REC);
+STYPE(TEXT_BUFFER_VIEW_REC);
+STYPE(MAIN_WINDOW_REC);
+STYPE(STATUSBAR_REC);
+typedef struct SBAR_ITEM_REC SBAR_ITEM_REC;
+
+#include "signal-registry.def"
+
+#endif
diff --git a/src/irc/core/signal-registry.def b/src/irc/core/signal-registry.def
index 2be89a9b..ad9b0c37 100644
--- a/src/irc/core/signal-registry.def
+++ b/src/irc/core/signal-registry.def
@@ -67,7 +67,7 @@ SIGNAL_REGISTER(server_event, 4, (SERVER_REC *server, char *data, char *sender_n
 	 server, data, sender_nick, sender_address)
 SIGNAL_REGISTER_F(event, 4, (const char *cmd, SERVER_REC *server, const char *args, const char *sender_nick, const char *sender_address),
 	 cmd, server, args, sender_nick, sender_address)
-SIGNAL_REGISTER(default_event, 4, (SERVER_REC *server, char *data, char *sender_nick, char *sender_address),
+SIGNAL_REGISTER(default_event, 4, (SERVER_REC *server, const char *data, const char *sender_nick, const char *sender_address),
 	 server, data, sender_nick, sender_address)
 SIGNAL_REGISTER(whois_default_event, 4, (SERVER_REC *server, char *args, char *sender_nick, char *sender_address),
 	 server, args, sender_nick, sender_address)
@@ -117,17 +117,17 @@ SIGNAL_REGISTER(netsplit_remove, 1, (NETSPLIT_REC *netsplit),
 
 // dcc*.c:
 
-SIGNAL_REGISTER_F(dcc_ctcp, 2, (const char *cmd, char *args, DCC_REC *dcc),
-	 cmd, args, dcc)
-SIGNAL_REGISTER(default_dcc_ctcp, 2, (char *args, DCC_REC *dcc),
-	 args, dcc)
+SIGNAL_REGISTER_F(dcc_ctcp, 2, (const char *cmd, CHAT_DCC_REC *chat_dcc, char *args),
+	 cmd, chat_dcc, args)
+SIGNAL_REGISTER(default_dcc_ctcp, 3, (CHAT_DCC_REC *chat_dcc, char *cmd, char *args),
+	 chat_dcc, cmd, args)
 SIGNAL_REGISTER(dcc_unknown_ctcp, 3, (char *args, char *sender, char *sendaddr),
 	 args, sender, sendaddr)
 
-SIGNAL_REGISTER_F(dcc_reply, 2, (const char *cmd, char *args, DCC_REC *dcc),
-	 cmd, args, dcc)
-SIGNAL_REGISTER(default_dcc_reply, 2, (char *args, DCC_REC *dcc),
-	 args, dcc)
+SIGNAL_REGISTER_F(dcc_reply, 2, (const char *cmd, CHAT_DCC_REC *chat_dcc, char *args),
+	 cmd, chat_dcc, args)
+SIGNAL_REGISTER(default_dcc_reply, 3, (CHAT_DCC_REC *chat_dcc, char *cmd, char *args),
+	 chat_dcc, cmd, args)
 SIGNAL_REGISTER(dcc_unknown_reply, 3, (char *args, char *sender, char *sendaddr),
 	 args, sender, sendaddr)
 
@@ -182,6 +182,14 @@ SIGNAL_REGISTER(default_ctcp_msg_dcc, 6, (IRC_SERVER_REC *irc_server, const char
 	 irc_server, args, nick, addr, target, dcc)
 SIGNAL_REGISTER(default_ctcp_reply_dcc, 5, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
 	 irc_server, args, nick, addr, target)
+SIGNAL_REGISTER(ctcp_msg_dcc, 6, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target, DCC_REC *dcc),
+	 irc_server, args, nick, addr, target, dcc)
+SIGNAL_REGISTER_F(ctcp_msg_dcc, 6, (const char *cmd, IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target, DCC_REC *dcc),
+	 cmd, irc_server, args, nick, addr, target, dcc)
+SIGNAL_REGISTER(ctcp_reply_dcc, 6, (IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target, DCC_REC *dcc),
+	 irc_server, args, nick, addr, target, dcc)
+SIGNAL_REGISTER_F(ctcp_reply_dcc, 5, (const char *cmd, IRC_SERVER_REC *irc_server, const char *args, const char *nick, const char *addr, const char *target),
+	 cmd, irc_server, args, nick, addr, target)
 
 // autoignore.c:
 
diff --git a/src/irc/core/signal-registry.def.in b/src/irc/core/signal-registry.def.in
index baac0415..82baa636 100644
--- a/src/irc/core/signal-registry.def.in
+++ b/src/irc/core/signal-registry.def.in
@@ -42,7 +42,7 @@
 
  "server event", SERVER_REC, char *data, char *sender_nick, char *sender_address
  "event "<cmd>, SERVER_REC, const char *args, const char *sender_nick, const char *sender_address
- "default event", SERVER_REC, char *data, char *sender_nick, char *sender_address
+ "default event", SERVER_REC, const char *data, const char *sender_nick, const char *sender_address
  "whois default event", SERVER_REC, char *args, char *sender_nick, char *sender_address
 
  "server incoming", SERVER_REC, char *data
@@ -75,12 +75,12 @@
 
 // dcc*.c:
 
- "dcc ctcp "<cmd>, char *args, DCC_REC
- "default dcc ctcp", char *args, DCC_REC
+ "dcc ctcp "<cmd>, CHAT_DCC_REC, char *args
+ "default dcc ctcp", CHAT_DCC_REC, char *cmd, char *args
  "dcc unknown ctcp", char *args, char *sender, char *sendaddr
 
- "dcc reply "<cmd>, char *args, DCC_REC
- "default dcc reply", char *args, DCC_REC
+ "dcc reply "<cmd>, CHAT_DCC_REC, char *args
+ "default dcc reply", CHAT_DCC_REC, char *cmd, char *args
  "dcc unknown reply", char *args, char *sender, char *sendaddr
 
  "dcc created", DCC_REC
@@ -109,6 +109,10 @@
 
  "default ctcp msg dcc", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target, DCC_REC
  "default ctcp reply dcc", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
+ "ctcp msg dcc", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target, DCC_REC
+ "ctcp msg dcc "<cmd>, IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target, DCC_REC
+ "ctcp reply dcc", IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target, DCC_REC
+ "ctcp reply dcc "<cmd>, IRC_SERVER_REC, const char *args, const char *nick, const char *addr, const char *target
 
 // autoignore.c:
 
diff --git a/src/irc/core/signal-registry.h b/src/irc/core/signal-registry.h
index ef2c2ea4..772c186f 100644
--- a/src/irc/core/signal-registry.h
+++ b/src/irc/core/signal-registry.h
@@ -4,6 +4,7 @@
 #include "modules.h"
 #include "signal-registry-macros.h"
 
+STYPE(IRC_SERVER_REC);
 STYPE(BAN_REC);
 STYPE(NETSPLIT_SERVER_REC);
 STYPE(NETSPLIT_REC);
diff --git a/src/otr/signal-registry.def b/src/otr/signal-registry.def
index 3f1d91fc..114b5931 100644
--- a/src/otr/signal-registry.def
+++ b/src/otr/signal-registry.def
@@ -1,4 +1,5 @@
 // OTR Core
 
 // otr.c:
- "otr event", SERVER_REC, char *nick, char *status
+SIGNAL_REGISTER(otr_event, 3, (SERVER_REC *server, const char *nick, const char *status),
+	 server, nick, status)
diff --git a/src/otr/signal-registry.def.in b/src/otr/signal-registry.def.in
new file mode 100644
index 00000000..41af06ae
--- /dev/null
+++ b/src/otr/signal-registry.def.in
@@ -0,0 +1,4 @@
+// OTR Core
+
+// otr.c:
+ "otr event", SERVER_REC, const char *nick, const char *status
diff --git a/src/otr/signal-registry.h b/src/otr/signal-registry.h
new file mode 100644
index 00000000..cfd7d803
--- /dev/null
+++ b/src/otr/signal-registry.h
@@ -0,0 +1,10 @@
+#ifndef IRSSI_OTR_SIGNAL_REGISTRY_H
+#define IRSSI_OTR_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+
+#include "signal-registry.def"
+
+#endif
diff --git a/src/perl/signal-registry.def b/src/perl/signal-registry.def
index c09b416b..7f4fa5eb 100644
--- a/src/perl/signal-registry.def
+++ b/src/perl/signal-registry.def
@@ -1,3 +1,4 @@
 // Perl
 
-"script error", PERL_SCRIPT_REC, char *errormsg
+SIGNAL_REGISTER(script_error, 2, (PERL_SCRIPT_REC *perl_script, char *errormsg),
+	 perl_script, errormsg)
diff --git a/src/perl/signal-registry.def.in b/src/perl/signal-registry.def.in
new file mode 100644
index 00000000..c09b416b
--- /dev/null
+++ b/src/perl/signal-registry.def.in
@@ -0,0 +1,3 @@
+// Perl
+
+"script error", PERL_SCRIPT_REC, char *errormsg
diff --git a/src/perl/signal-registry.h b/src/perl/signal-registry.h
new file mode 100644
index 00000000..4b6f7a34
--- /dev/null
+++ b/src/perl/signal-registry.h
@@ -0,0 +1,11 @@
+#ifndef IRSSI_PERL_SIGNAL_REGISTRY_H
+#define IRSSI_PERL_SIGNAL_REGISTRY_H
+
+#include "modules.h"
+#include "signal-registry-macros.h"
+
+STYPE(PERL_SCRIPT_REC);
+
+#include "signal-registry.def"
+
+#endif