Code cleanup: renamed some constants and variables (prefix added)

25 files changed, 658 insertions, 693 deletions

diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 285fb1762..6f2c56a2f 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -86,7 +86,7 @@ gui_chat_reset_style (t_gui_window *window)
     window->current_style_attr = 0;
     window->current_color_attr = 0;
     
-    gui_window_set_weechat_color (GUI_CURSES(window)->win_chat, COLOR_WIN_CHAT);
+    gui_window_set_weechat_color (GUI_CURSES(window)->win_chat, GUI_COLOR_WIN_CHAT);
     gui_chat_remove_style (window,
                            A_BOLD | A_UNDERLINE | A_REVERSE);
 }
@@ -177,22 +177,22 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
         if ((ptr_win->buffer == buffer) && (buffer->num_displayed > 0))
         {
             if (erase)
-                gui_window_curses_clear (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
+                gui_window_curses_clear (GUI_CURSES(ptr_win)->win_title, GUI_COLOR_WIN_TITLE);
             
             snprintf (format, 32, "%%-%ds", ptr_win->win_title_width);
             wmove (GUI_CURSES(ptr_win)->win_title, 0, 0);
             
-            if (CHANNEL(buffer))
+            if (GUI_CHANNEL(buffer))
             {
-                if (CHANNEL(buffer)->topic)
+                if (GUI_CHANNEL(buffer)->topic)
                 {
-                    buf = (char *)gui_color_decode ((unsigned char *)(CHANNEL(buffer)->topic), 0, 0);
-                    ptr_topic = utf8_add_offset ((buf) ? buf : CHANNEL(buffer)->topic,
+                    buf = (char *)gui_color_decode ((unsigned char *)(GUI_CHANNEL(buffer)->topic), 0, 0);
+                    ptr_topic = utf8_add_offset ((buf) ? buf : GUI_CHANNEL(buffer)->topic,
                                                  ptr_win->win_title_start);
                     if (!ptr_topic || !ptr_topic[0])
                     {
                         ptr_win->win_title_start = 0;
-                        ptr_topic = (buf) ? buf : CHANNEL(buffer)->topic;
+                        ptr_topic = (buf) ? buf : GUI_CHANNEL(buffer)->topic;
                     }
                     buf2 = weechat_iconv_from_internal (NULL,
                                                         ptr_topic);
@@ -200,22 +200,22 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
                     if (ptr_win->win_title_start > 0)
                     {
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title,
-                                                      COLOR_WIN_TITLE_MORE);
+                                                      GUI_COLOR_WIN_TITLE_MORE);
                         wprintw (GUI_CURSES(ptr_win)->win_title, "%s", "++");
                     }
                     
                     if (utf8_width_screen (ptr_topic) > ptr_win->win_width)
                     {
-                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
+                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, GUI_COLOR_WIN_TITLE);
                         wprintw (GUI_CURSES(ptr_win)->win_title, "%s", (buf2) ? buf2 : ptr_topic);
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title,
-                                                      COLOR_WIN_TITLE_MORE);
+                                                      GUI_COLOR_WIN_TITLE_MORE);
                         mvwprintw (GUI_CURSES(ptr_win)->win_title, 0, ptr_win->win_width - 2,
                                    "%s", "++");
                     }
                     else
                     {
-                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
+                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, GUI_COLOR_WIN_TITLE);
                         wprintw (GUI_CURSES(ptr_win)->win_title, "%s", (buf2) ? buf2 : ptr_topic);
                     }
                     if (buf)
@@ -225,14 +225,14 @@ gui_chat_draw_title (t_gui_buffer *buffer, int erase)
                 }
                 else
                 {
-                    gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
+                    gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, GUI_COLOR_WIN_TITLE);
                     wprintw (GUI_CURSES(ptr_win)->win_title, format, " ");
                 }
             }
             else
             {
-                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, COLOR_WIN_TITLE);
-                if (buffer->type == BUFFER_TYPE_STANDARD)
+                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_title, GUI_COLOR_WIN_TITLE);
+                if (buffer->type == GUI_BUFFER_TYPE_STANDARD)
                 {
                     wprintw (GUI_CURSES(ptr_win)->win_title,
                              format,
@@ -815,12 +815,12 @@ gui_chat_display_line (t_gui_window *window, t_gui_line *line, int count,
         if (cfg_look_read_marker && cfg_look_read_marker[0])
         {
             /* display marker if line is matching user search */
-            if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
+            if (window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
             {
                 if (gui_buffer_line_search (line, window->buffer->input_buffer,
                                             window->buffer->text_search_exact))
                 {
-                    gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
+                    gui_chat_set_weechat_color (window, GUI_COLOR_WIN_CHAT_READ_MARKER);
                     mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
                                "%c", cfg_look_read_marker[0]);
                 }
@@ -831,7 +831,7 @@ gui_chat_display_line (t_gui_window *window, t_gui_line *line, int count,
                 if (window->buffer->last_read_line &&
                     (window->buffer->last_read_line == line->prev_line))
                 {
-                    gui_chat_set_weechat_color (window, COLOR_WIN_CHAT_READ_MARKER);
+                    gui_chat_set_weechat_color (window, GUI_COLOR_WIN_CHAT_READ_MARKER);
                     mvwprintw (GUI_CURSES(window)->win_chat, read_marker_y, read_marker_x,
                                "%c", cfg_look_read_marker[0]);
                 }
@@ -970,7 +970,7 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
         {
             if (erase)
             {
-                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat, COLOR_WIN_CHAT);
+                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat, GUI_COLOR_WIN_CHAT);
                 
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_chat_width);
                 for (i = 0; i < ptr_win->win_chat_height; i++)
@@ -979,13 +979,13 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
                 }
             }
             
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat, COLOR_WIN_CHAT);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat, GUI_COLOR_WIN_CHAT);
             
-            if (buffer->type == BUFFER_TYPE_DCC)
+            if (buffer->type == GUI_BUFFER_TYPE_DCC)
             {
                 i = 0;
-                dcc_first = (ptr_win->dcc_first) ? (t_irc_dcc *) ptr_win->dcc_first : dcc_list;
-                dcc_selected = (ptr_win->dcc_selected) ? (t_irc_dcc *) ptr_win->dcc_selected : dcc_list;
+                dcc_first = (ptr_win->dcc_first) ? (t_irc_dcc *) ptr_win->dcc_first : irc_dcc_list;
+                dcc_selected = (ptr_win->dcc_selected) ? (t_irc_dcc *) ptr_win->dcc_selected : irc_dcc_list;
                 for (ptr_dcc = dcc_first; ptr_dcc; ptr_dcc = ptr_dcc->next_dcc)
                 {
                     if (i >= ptr_win->win_chat_height - 1)
@@ -994,19 +994,19 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
                     /* nickname and filename */
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat,
                                                   (ptr_dcc == dcc_selected) ?
-                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                                                  GUI_COLOR_DCC_SELECTED : GUI_COLOR_WIN_CHAT);
                     mvwprintw (GUI_CURSES(ptr_win)->win_chat, i, 0, "%s %-16s ",
                                (ptr_dcc == dcc_selected) ? "***" : "   ",
                                ptr_dcc->nick);
                     buf = weechat_iconv_from_internal (NULL,
-                                                       (DCC_IS_CHAT(ptr_dcc->type)) ?
+                                                       (IRC_DCC_IS_CHAT(ptr_dcc->type)) ?
                                                        _(ptr_dcc->filename) : ptr_dcc->filename);
                     wprintw (GUI_CURSES(ptr_win)->win_chat, "%s",
-                             (buf) ? buf : ((DCC_IS_CHAT(ptr_dcc->type)) ?
+                             (buf) ? buf : ((IRC_DCC_IS_CHAT(ptr_dcc->type)) ?
                              _(ptr_dcc->filename) : ptr_dcc->filename));
                     if (buf)
                         free (buf);
-                    if (DCC_IS_FILE(ptr_dcc->type))
+                    if (IRC_DCC_IS_FILE(ptr_dcc->type))
                     {
                         if (ptr_dcc->filename_suffix > 0)
                             wprintw (GUI_CURSES(ptr_win)->win_chat, " (.%d)",
@@ -1016,28 +1016,28 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
                     /* status */
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat,
                                                   (ptr_dcc == dcc_selected) ?
-                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
+                                                  GUI_COLOR_DCC_SELECTED : GUI_COLOR_WIN_CHAT);
                     mvwprintw (GUI_CURSES(ptr_win)->win_chat, i + 1, 0, "%s %s ",
                                (ptr_dcc == dcc_selected) ? "***" : "   ",
-                               (DCC_IS_RECV(ptr_dcc->type)) ? "-->>" : "<<--");
+                               (IRC_DCC_IS_RECV(ptr_dcc->type)) ? "-->>" : "<<--");
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat,
-                                                  COLOR_DCC_WAITING + ptr_dcc->status);
-                    buf = weechat_iconv_from_internal (NULL, _(dcc_status_string[ptr_dcc->status]));
+                                                  GUI_COLOR_DCC_WAITING + ptr_dcc->status);
+                    buf = weechat_iconv_from_internal (NULL, _(irc_dcc_status_string[ptr_dcc->status]));
                     wprintw (GUI_CURSES(ptr_win)->win_chat, "%-10s",
-                             (buf) ? buf : _(dcc_status_string[ptr_dcc->status]));
+                             (buf) ? buf : _(irc_dcc_status_string[ptr_dcc->status]));
                     if (buf)
                         free (buf);
                     
                     /* other infos */
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_chat,
                                                   (ptr_dcc == dcc_selected) ?
-                                                  COLOR_DCC_SELECTED : COLOR_WIN_CHAT);
-                    if (DCC_IS_FILE(ptr_dcc->type))
+                                                  GUI_COLOR_DCC_SELECTED : GUI_COLOR_WIN_CHAT);
+                    if (IRC_DCC_IS_FILE(ptr_dcc->type))
                     {
                         wprintw (GUI_CURSES(ptr_win)->win_chat, "  [");
                         if (ptr_dcc->size == 0)
                         {
-                            if (ptr_dcc->status == DCC_DONE)
+                            if (ptr_dcc->status == IRC_DCC_DONE)
                                 num_bars = 10;
                             else
                                 num_bars = 0;
@@ -1061,7 +1061,7 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
                             num_unit = 3;
                         if (ptr_dcc->size == 0)
                         {
-                            if (ptr_dcc->status == DCC_DONE)
+                            if (ptr_dcc->status == IRC_DCC_DONE)
                                 pct_complete = 100;
                             else
                                 pct_complete = 0;
@@ -1086,7 +1086,7 @@ gui_chat_draw (t_gui_buffer *buffer, int erase)
                         else
                             num_unit = 3;
                         wprintw (GUI_CURSES(ptr_win)->win_chat, "  (");
-                        if (ptr_dcc->status == DCC_ACTIVE)
+                        if (ptr_dcc->status == IRC_DCC_ACTIVE)
                         {
                             wprintw (GUI_CURSES(ptr_win)->win_chat, _("ETA"));
                             wprintw (GUI_CURSES(ptr_win)->win_chat, ": %.2lu:%.2lu:%.2lu - ",
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index b53e10525..0cedceeba 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -495,65 +495,65 @@ gui_color_init_weechat ()
 {
     int i;
     
-    gui_color[COLOR_WIN_SEPARATOR] = gui_color_build (COLOR_WIN_SEPARATOR, cfg_col_separator, cfg_col_separator);
-    gui_color[COLOR_WIN_TITLE] = gui_color_build (COLOR_WIN_TITLE, cfg_col_title, cfg_col_title_bg);
-    gui_color[COLOR_WIN_TITLE_MORE] = gui_color_build (COLOR_WIN_TITLE_MORE, cfg_col_title_more, cfg_col_title_bg);
-    gui_color[COLOR_WIN_CHAT] = gui_color_build (COLOR_WIN_CHAT, cfg_col_chat, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_TIME] = gui_color_build (COLOR_WIN_CHAT_TIME, cfg_col_chat_time, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_TIME_SEP] = gui_color_build (COLOR_WIN_CHAT_TIME_SEP, cfg_col_chat_time_sep, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_PREFIX1] = gui_color_build (COLOR_WIN_CHAT_PREFIX1, cfg_col_chat_prefix1, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_PREFIX2] = gui_color_build (COLOR_WIN_CHAT_PREFIX2, cfg_col_chat_prefix2, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_SERVER] = gui_color_build (COLOR_WIN_CHAT_SERVER, cfg_col_chat_server, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_JOIN] = gui_color_build (COLOR_WIN_CHAT_JOIN, cfg_col_chat_join, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_PART] = gui_color_build (COLOR_WIN_CHAT_PART, cfg_col_chat_part, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_NICK] = gui_color_build (COLOR_WIN_CHAT_NICK, cfg_col_chat_nick, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_HOST] = gui_color_build (COLOR_WIN_CHAT_HOST, cfg_col_chat_host, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_CHANNEL] = gui_color_build (COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_DARK] = gui_color_build (COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_READ_MARKER] = gui_color_build (COLOR_WIN_CHAT_READ_MARKER, cfg_col_chat_read_marker, cfg_col_chat_read_marker_bg);
-    gui_color[COLOR_WIN_STATUS] = gui_color_build (COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_CHANNEL] = gui_color_build (COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_MSG] = gui_color_build (COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_PRIVATE] = gui_color_build (COLOR_WIN_STATUS_DATA_PRIVATE, cfg_col_status_data_private, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_HIGHLIGHT] = gui_color_build (COLOR_WIN_STATUS_DATA_HIGHLIGHT, cfg_col_status_data_highlight, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_OTHER] = gui_color_build (COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_MORE] = gui_color_build (COLOR_WIN_STATUS_MORE, cfg_col_status_more, cfg_col_status_bg);
-    gui_color[COLOR_WIN_INFOBAR] = gui_color_build (COLOR_WIN_INFOBAR, cfg_col_infobar, cfg_col_infobar_bg);
-    gui_color[COLOR_WIN_INFOBAR_DELIMITERS] = gui_color_build (COLOR_WIN_INFOBAR_DELIMITERS, cfg_col_infobar_delimiters, cfg_col_infobar_bg);
-    gui_color[COLOR_WIN_INFOBAR_HIGHLIGHT] = gui_color_build (COLOR_WIN_INFOBAR_HIGHLIGHT, cfg_col_infobar_highlight, cfg_col_infobar_bg);
-    gui_color[COLOR_WIN_INPUT] = gui_color_build (COLOR_WIN_INPUT, cfg_col_input, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_SERVER] = gui_color_build (COLOR_WIN_INPUT_SERVER, cfg_col_input_server, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_CHANNEL] = gui_color_build (COLOR_WIN_INPUT_CHANNEL, cfg_col_input_channel, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_NICK] = gui_color_build (COLOR_WIN_INPUT_NICK, cfg_col_input_nick, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_DELIMITERS] = gui_color_build (COLOR_WIN_INPUT_DELIMITERS, cfg_col_input_delimiters, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_TEXT_NOT_FOUND] = gui_color_build (COLOR_WIN_INPUT_TEXT_NOT_FOUND, cfg_col_input_text_not_found, cfg_col_input_bg);
-    gui_color[COLOR_WIN_NICK] = gui_color_build (COLOR_WIN_NICK, cfg_col_nick, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_AWAY] = gui_color_build (COLOR_WIN_NICK_AWAY, cfg_col_nick_away, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_CHANOWNER] = gui_color_build (COLOR_WIN_NICK_CHANOWNER, cfg_col_nick_chanowner, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_CHANADMIN] = gui_color_build (COLOR_WIN_NICK_CHANADMIN, cfg_col_nick_chanadmin, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_OP] = gui_color_build (COLOR_WIN_NICK_OP, cfg_col_nick_op, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_HALFOP] = gui_color_build (COLOR_WIN_NICK_HALFOP, cfg_col_nick_halfop, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_VOICE] = gui_color_build (COLOR_WIN_NICK_VOICE, cfg_col_nick_voice, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_CHANUSER] = gui_color_build (COLOR_WIN_NICK_CHANUSER, cfg_col_nick_user, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_MORE] = gui_color_build (COLOR_WIN_NICK_MORE, cfg_col_nick_more, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_SEP] = gui_color_build (COLOR_WIN_NICK_SEP, cfg_col_nick_sep, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_SELF] = gui_color_build (COLOR_WIN_NICK_SELF, cfg_col_nick_self, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_PRIVATE] = gui_color_build (COLOR_WIN_NICK_PRIVATE, cfg_col_nick_private, cfg_col_nick_bg);
-
-    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
+    gui_color[GUI_COLOR_WIN_SEPARATOR] = gui_color_build (GUI_COLOR_WIN_SEPARATOR, cfg_col_separator, cfg_col_separator);
+    gui_color[GUI_COLOR_WIN_TITLE] = gui_color_build (GUI_COLOR_WIN_TITLE, cfg_col_title, cfg_col_title_bg);
+    gui_color[GUI_COLOR_WIN_TITLE_MORE] = gui_color_build (GUI_COLOR_WIN_TITLE_MORE, cfg_col_title_more, cfg_col_title_bg);
+    gui_color[GUI_COLOR_WIN_CHAT] = gui_color_build (GUI_COLOR_WIN_CHAT, cfg_col_chat, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_TIME] = gui_color_build (GUI_COLOR_WIN_CHAT_TIME, cfg_col_chat_time, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_TIME_SEP] = gui_color_build (GUI_COLOR_WIN_CHAT_TIME_SEP, cfg_col_chat_time_sep, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_PREFIX1] = gui_color_build (GUI_COLOR_WIN_CHAT_PREFIX1, cfg_col_chat_prefix1, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_PREFIX2] = gui_color_build (GUI_COLOR_WIN_CHAT_PREFIX2, cfg_col_chat_prefix2, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_SERVER] = gui_color_build (GUI_COLOR_WIN_CHAT_SERVER, cfg_col_chat_server, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_JOIN] = gui_color_build (GUI_COLOR_WIN_CHAT_JOIN, cfg_col_chat_join, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_PART] = gui_color_build (GUI_COLOR_WIN_CHAT_PART, cfg_col_chat_part, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_NICK] = gui_color_build (GUI_COLOR_WIN_CHAT_NICK, cfg_col_chat_nick, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_HOST] = gui_color_build (GUI_COLOR_WIN_CHAT_HOST, cfg_col_chat_host, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_CHANNEL] = gui_color_build (GUI_COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_DARK] = gui_color_build (GUI_COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (GUI_COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_WIN_CHAT_READ_MARKER] = gui_color_build (GUI_COLOR_WIN_CHAT_READ_MARKER, cfg_col_chat_read_marker, cfg_col_chat_read_marker_bg);
+    gui_color[GUI_COLOR_WIN_STATUS] = gui_color_build (GUI_COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (GUI_COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_CHANNEL] = gui_color_build (GUI_COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_DATA_MSG] = gui_color_build (GUI_COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_DATA_PRIVATE] = gui_color_build (GUI_COLOR_WIN_STATUS_DATA_PRIVATE, cfg_col_status_data_private, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_DATA_HIGHLIGHT] = gui_color_build (GUI_COLOR_WIN_STATUS_DATA_HIGHLIGHT, cfg_col_status_data_highlight, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_DATA_OTHER] = gui_color_build (GUI_COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_STATUS_MORE] = gui_color_build (GUI_COLOR_WIN_STATUS_MORE, cfg_col_status_more, cfg_col_status_bg);
+    gui_color[GUI_COLOR_WIN_INFOBAR] = gui_color_build (GUI_COLOR_WIN_INFOBAR, cfg_col_infobar, cfg_col_infobar_bg);
+    gui_color[GUI_COLOR_WIN_INFOBAR_DELIMITERS] = gui_color_build (GUI_COLOR_WIN_INFOBAR_DELIMITERS, cfg_col_infobar_delimiters, cfg_col_infobar_bg);
+    gui_color[GUI_COLOR_WIN_INFOBAR_HIGHLIGHT] = gui_color_build (GUI_COLOR_WIN_INFOBAR_HIGHLIGHT, cfg_col_infobar_highlight, cfg_col_infobar_bg);
+    gui_color[GUI_COLOR_WIN_INPUT] = gui_color_build (GUI_COLOR_WIN_INPUT, cfg_col_input, cfg_col_input_bg);
+    gui_color[GUI_COLOR_WIN_INPUT_SERVER] = gui_color_build (GUI_COLOR_WIN_INPUT_SERVER, cfg_col_input_server, cfg_col_input_bg);
+    gui_color[GUI_COLOR_WIN_INPUT_CHANNEL] = gui_color_build (GUI_COLOR_WIN_INPUT_CHANNEL, cfg_col_input_channel, cfg_col_input_bg);
+    gui_color[GUI_COLOR_WIN_INPUT_NICK] = gui_color_build (GUI_COLOR_WIN_INPUT_NICK, cfg_col_input_nick, cfg_col_input_bg);
+    gui_color[GUI_COLOR_WIN_INPUT_DELIMITERS] = gui_color_build (GUI_COLOR_WIN_INPUT_DELIMITERS, cfg_col_input_delimiters, cfg_col_input_bg);
+    gui_color[GUI_COLOR_WIN_INPUT_TEXT_NOT_FOUND] = gui_color_build (GUI_COLOR_WIN_INPUT_TEXT_NOT_FOUND, cfg_col_input_text_not_found, cfg_col_input_bg);
+    gui_color[GUI_COLOR_WIN_NICK] = gui_color_build (GUI_COLOR_WIN_NICK, cfg_col_nick, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_AWAY] = gui_color_build (GUI_COLOR_WIN_NICK_AWAY, cfg_col_nick_away, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_CHANOWNER] = gui_color_build (GUI_COLOR_WIN_NICK_CHANOWNER, cfg_col_nick_chanowner, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_CHANADMIN] = gui_color_build (GUI_COLOR_WIN_NICK_CHANADMIN, cfg_col_nick_chanadmin, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_OP] = gui_color_build (GUI_COLOR_WIN_NICK_OP, cfg_col_nick_op, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_HALFOP] = gui_color_build (GUI_COLOR_WIN_NICK_HALFOP, cfg_col_nick_halfop, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_VOICE] = gui_color_build (GUI_COLOR_WIN_NICK_VOICE, cfg_col_nick_voice, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_CHANUSER] = gui_color_build (GUI_COLOR_WIN_NICK_CHANUSER, cfg_col_nick_user, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_MORE] = gui_color_build (GUI_COLOR_WIN_NICK_MORE, cfg_col_nick_more, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_SEP] = gui_color_build (GUI_COLOR_WIN_NICK_SEP, cfg_col_nick_sep, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_SELF] = gui_color_build (GUI_COLOR_WIN_NICK_SELF, cfg_col_nick_self, cfg_col_nick_bg);
+    gui_color[GUI_COLOR_WIN_NICK_PRIVATE] = gui_color_build (GUI_COLOR_WIN_NICK_PRIVATE, cfg_col_nick_private, cfg_col_nick_bg);
+
+    for (i = 0; i < GUI_COLOR_WIN_NICK_NUMBER; i++)
     {
-        gui_color[COLOR_WIN_NICK_1 + i] = gui_color_build (COLOR_WIN_NICK_1 + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
+        gui_color[GUI_COLOR_WIN_NICK_1 + i] = gui_color_build (GUI_COLOR_WIN_NICK_1 + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
     }
         
-    gui_color[COLOR_DCC_SELECTED] = gui_color_build (COLOR_DCC_SELECTED, cfg_col_dcc_selected, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_WAITING] = gui_color_build (COLOR_DCC_WAITING, cfg_col_dcc_waiting, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_CONNECTING] = gui_color_build (COLOR_DCC_CONNECTING, cfg_col_dcc_connecting, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_ACTIVE] = gui_color_build (COLOR_DCC_ACTIVE, cfg_col_dcc_active, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_DONE] = gui_color_build (COLOR_DCC_DONE, cfg_col_dcc_done, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_FAILED] = gui_color_build (COLOR_DCC_FAILED, cfg_col_dcc_failed, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_ABORTED] = gui_color_build (COLOR_DCC_ABORTED, cfg_col_dcc_aborted, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_SELECTED] = gui_color_build (GUI_COLOR_DCC_SELECTED, cfg_col_dcc_selected, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_WAITING] = gui_color_build (GUI_COLOR_DCC_WAITING, cfg_col_dcc_waiting, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_CONNECTING] = gui_color_build (GUI_COLOR_DCC_CONNECTING, cfg_col_dcc_connecting, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_ACTIVE] = gui_color_build (GUI_COLOR_DCC_ACTIVE, cfg_col_dcc_active, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_DONE] = gui_color_build (GUI_COLOR_DCC_DONE, cfg_col_dcc_done, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_FAILED] = gui_color_build (GUI_COLOR_DCC_FAILED, cfg_col_dcc_failed, cfg_col_chat_bg);
+    gui_color[GUI_COLOR_DCC_ABORTED] = gui_color_build (GUI_COLOR_DCC_ABORTED, cfg_col_dcc_aborted, cfg_col_chat_bg);
 }
 
 /*
diff --git a/src/gui/curses/gui-curses-infobar.c b/src/gui/curses/gui-curses-infobar.c
index 0ae11a490..0e7a3ce9b 100644
--- a/src/gui/curses/gui-curses-infobar.c
+++ b/src/gui/curses/gui-curses-infobar.c
@@ -57,7 +57,7 @@ gui_infobar_draw_time (t_gui_buffer *buffer)
         local_time = localtime (&time_seconds);
         if (local_time)
         {
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR);
             mvwprintw (GUI_CURSES(ptr_win)->win_infobar,
                        0, 1,
                        "%02d:%02d",
@@ -92,18 +92,18 @@ gui_infobar_draw (t_gui_buffer *buffer, int erase)
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
         if (erase)
-            gui_window_curses_clear (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_curses_clear (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR);
         
-        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR);
+        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR);
         
         time_seconds = time (NULL);
         local_time = localtime (&time_seconds);
         if (local_time)
         {
             strftime (text_time, 1024, cfg_look_infobar_timestamp, local_time);
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_infobar, "[");
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR);
             wprintw (GUI_CURSES(ptr_win)->win_infobar,
                      "%02d:%02d",
                      local_time->tm_hour, local_time->tm_min);
@@ -111,15 +111,15 @@ gui_infobar_draw (t_gui_buffer *buffer, int erase)
                 wprintw (GUI_CURSES(ptr_win)->win_infobar,
                          ":%02d",
                          local_time->tm_sec);
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_infobar, "]");
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR);
             wprintw (GUI_CURSES(ptr_win)->win_infobar,
                      " %s", text_time);
         }
         if (gui_infobar)
         {
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, COLOR_WIN_INFOBAR_DELIMITERS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, GUI_COLOR_WIN_INFOBAR_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_infobar, " | ");
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_infobar, gui_infobar->color);
             buf = weechat_iconv_from_internal (NULL, gui_infobar->text);
diff --git a/src/gui/curses/gui-curses-input.c b/src/gui/curses/gui-curses-input.c
index 8b25c7a51..817c931a4 100644
--- a/src/gui/curses/gui-curses-input.c
+++ b/src/gui/curses/gui-curses-input.c
@@ -48,7 +48,7 @@ gui_input_set_color (t_gui_window *window, int irc_color)
     int fg, bg;
     
     fg = gui_irc_colors[irc_color][0];
-    bg = gui_color[COLOR_WIN_INPUT]->background;
+    bg = gui_color[GUI_COLOR_WIN_INPUT]->background;
     
     irc_color %= GUI_NUM_IRC_COLORS;
     if (gui_irc_colors[irc_color][1] & A_BOLD)
@@ -77,7 +77,7 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
     char *pos, saved_char;
     int char_size, length;
     
-    if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
     {
         if (window->buffer->text_search_exact)
             return utf8_width_screen (_("Text search (exact): "));
@@ -96,21 +96,21 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
                 switch (pos[0])
                 {
                     case 'c': /* channel or server name */
-                        if (CHANNEL(window->buffer))
-                            length += utf8_width_screen (CHANNEL(window->buffer)->name);
+                        if (GUI_CHANNEL(window->buffer))
+                            length += utf8_width_screen (GUI_CHANNEL(window->buffer)->name);
                         else
                         {
-                            if (SERVER(window->buffer))
-                                length += utf8_width_screen (SERVER(window->buffer)->name);
+                            if (GUI_SERVER(window->buffer))
+                                length += utf8_width_screen (GUI_SERVER(window->buffer)->name);
                         }
                         pos++;
                         break;
                     case 'm': /* nick modes */
-                        if (SERVER(window->buffer) && SERVER(window->buffer)->is_connected)
+                        if (GUI_SERVER(window->buffer) && GUI_SERVER(window->buffer)->is_connected)
                         {
-                            if (SERVER(window->buffer)->nick_modes
-                                && SERVER(window->buffer)->nick_modes[0])
-                                length += strlen (SERVER(window->buffer)->nick_modes);
+                            if (GUI_SERVER(window->buffer)->nick_modes
+                                && GUI_SERVER(window->buffer)->nick_modes[0])
+                                length += strlen (GUI_SERVER(window->buffer)->nick_modes);
                         }
                         pos++;
                         break;
@@ -160,10 +160,10 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
     
     wmove (GUI_CURSES(window)->win_input, 0, 0);
     
-    if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
     {
         gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                      COLOR_WIN_INPUT);
+                                      GUI_COLOR_WIN_INPUT);
         wprintw (GUI_CURSES(window)->win_input, "%s",
                  (window->buffer->text_search_exact) ?
                  _("Text search (exact): ") : _("Text search: "));
@@ -180,27 +180,27 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
                 switch (pos[0])
                 {
                     case 'c': /* channel or server name */
-                        if (CHANNEL(window->buffer))
+                        if (GUI_CHANNEL(window->buffer))
                         {
                             gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                                          COLOR_WIN_INPUT_CHANNEL);
+                                                          GUI_COLOR_WIN_INPUT_CHANNEL);
                             buf = weechat_iconv_from_internal (NULL,
-                                                               CHANNEL(window->buffer)->name);
+                                                               GUI_CHANNEL(window->buffer)->name);
                             wprintw (GUI_CURSES(window)->win_input, "%s",
-                                     (buf) ? buf : CHANNEL(window->buffer)->name);
+                                     (buf) ? buf : GUI_CHANNEL(window->buffer)->name);
                             if (buf)
                                 free (buf);
                         }
                         else
                         {
-                            if (SERVER(window->buffer))
+                            if (GUI_SERVER(window->buffer))
                             {
                                 gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                                              COLOR_WIN_INPUT_SERVER);
+                                                              GUI_COLOR_WIN_INPUT_SERVER);
                                 buf = weechat_iconv_from_internal (NULL,
-                                                                   SERVER(window->buffer)->name);
+                                                                   GUI_SERVER(window->buffer)->name);
                                 wprintw (GUI_CURSES(window)->win_input, "%s",
-                                         (buf) ? buf : SERVER(window->buffer)->name);
+                                         (buf) ? buf : GUI_SERVER(window->buffer)->name);
                                 if (buf)
                                     free (buf);
                             }
@@ -208,22 +208,22 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
                         pos++;
                         break;
                     case 'm': /* nick modes */
-                        if (SERVER(window->buffer) && SERVER(window->buffer)->is_connected)
+                        if (GUI_SERVER(window->buffer) && GUI_SERVER(window->buffer)->is_connected)
                         {
-                            if (SERVER(window->buffer)->nick_modes
-                                && SERVER(window->buffer)->nick_modes[0])
+                            if (GUI_SERVER(window->buffer)->nick_modes
+                                && GUI_SERVER(window->buffer)->nick_modes[0])
                             {
                                 gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                                              COLOR_WIN_INPUT);
+                                                              GUI_COLOR_WIN_INPUT);
                                 wprintw (GUI_CURSES(window)->win_input, "%s",
-                                         SERVER(window->buffer)->nick_modes);
+                                         GUI_SERVER(window->buffer)->nick_modes);
                             }
                         }
                         pos++;
                         break;
                     case 'n': /* nick */
                         gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                                      COLOR_WIN_INPUT_NICK);
+                                                      GUI_COLOR_WIN_INPUT_NICK);
                         buf = weechat_iconv_from_internal (NULL, nick);
                         wprintw (GUI_CURSES(window)->win_input, "%s", (buf) ? buf : nick);
                         if (buf)
@@ -237,7 +237,7 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
                             saved_char = pos[char_size];
                             pos[char_size] = '\0';
                             gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                                          COLOR_WIN_INPUT_DELIMITERS);
+                                                          GUI_COLOR_WIN_INPUT_DELIMITERS);
                             wprintw (GUI_CURSES(window)->win_input, "%%%s", pos);
                             pos[char_size] = saved_char;
                             pos += char_size;
@@ -255,7 +255,7 @@ gui_input_draw_prompt (t_gui_window *window, char *nick)
                 saved_char = pos[char_size];
                 pos[char_size] = '\0';
                 gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                              COLOR_WIN_INPUT_DELIMITERS);
+                                              GUI_COLOR_WIN_INPUT_DELIMITERS);
                 wprintw (GUI_CURSES(window)->win_input, "%s", pos);
                 pos[char_size] = saved_char;
                 pos += char_size;
@@ -283,14 +283,14 @@ gui_input_draw_text (t_gui_window *window, int input_width)
     count_cursor = window->buffer->input_buffer_pos -
         window->buffer->input_buffer_1st_display;
     offset_cursor = 0;
-    if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
     {
         if (window->buffer->text_search_found)
             gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                          COLOR_WIN_INPUT);
+                                          GUI_COLOR_WIN_INPUT);
         else
             gui_window_set_weechat_color (GUI_CURSES(window)->win_input,
-                                          COLOR_WIN_INPUT_TEXT_NOT_FOUND);
+                                          GUI_COLOR_WIN_INPUT_TEXT_NOT_FOUND);
     }
     while ((input_width > 0) && ptr_start && ptr_start[0])
     {
@@ -300,7 +300,7 @@ gui_input_draw_text (t_gui_window *window, int input_width)
             saved_char = ptr_next[0];
             ptr_next[0] = '\0';
             size = ptr_next - ptr_start;
-            if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+            if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
             {
                 if (window->buffer->input_buffer_color_mask[pos_mask] != ' ')
                     color = window->buffer->input_buffer_color_mask[pos_mask] - '0';
@@ -309,7 +309,7 @@ gui_input_draw_text (t_gui_window *window, int input_width)
                 if (color != last_color)
                 {
                     if (color == -1)
-                        gui_window_set_weechat_color (GUI_CURSES(window)->win_input, COLOR_WIN_INPUT);
+                        gui_window_set_weechat_color (GUI_CURSES(window)->win_input, GUI_COLOR_WIN_INPUT);
                     else
                         gui_input_set_color (window, color);
                 }
@@ -376,19 +376,19 @@ gui_input_draw (t_gui_buffer *buffer, int erase)
         if (ptr_win->buffer == buffer)
         {
             if (erase)
-                gui_window_curses_clear (GUI_CURSES(ptr_win)->win_input, COLOR_WIN_INPUT);
+                gui_window_curses_clear (GUI_CURSES(ptr_win)->win_input, GUI_COLOR_WIN_INPUT);
             
             switch (buffer->type)
             {
-                case BUFFER_TYPE_STANDARD:
+                case GUI_BUFFER_TYPE_STANDARD:
                     if (buffer->has_input)
                     {
                         if (buffer->input_buffer_length == 0)
                             buffer->input_buffer[0] = '\0';
                         
-                        if (SERVER(buffer) && SERVER(buffer)->is_connected)
-                            ptr_nickname = (SERVER(buffer)->nick) ?
-                                SERVER(buffer)->nick : cfg_look_no_nickname;
+                        if (GUI_SERVER(buffer) && GUI_SERVER(buffer)->is_connected)
+                            ptr_nickname = (GUI_SERVER(buffer)->nick) ?
+                                GUI_SERVER(buffer)->nick : cfg_look_no_nickname;
                         else
                             ptr_nickname = cfg_look_no_nickname;
                         
@@ -428,7 +428,7 @@ gui_input_draw (t_gui_buffer *buffer, int erase)
                         if (display_prompt)
                             gui_input_draw_prompt (ptr_win, ptr_nickname);
                         
-                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_input, COLOR_WIN_INPUT);
+                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_input, GUI_COLOR_WIN_INPUT);
                         snprintf (format, 32, "%%-%ds", ptr_win->win_input_width - prompt_length);
                         offset_cursor = 0;
                         if (ptr_win == gui_current_window)
@@ -443,28 +443,28 @@ gui_input_draw (t_gui_buffer *buffer, int erase)
                                   ptr_win->win_input_x + ptr_win->win_input_cursor_x);
                     }
                     break;
-                case BUFFER_TYPE_DCC:
-                    dcc_selected = (ptr_win->dcc_selected) ? (t_irc_dcc *) ptr_win->dcc_selected : dcc_list;
+                case GUI_BUFFER_TYPE_DCC:
+                    dcc_selected = (ptr_win->dcc_selected) ? (t_irc_dcc *) ptr_win->dcc_selected : irc_dcc_list;
                     wmove (GUI_CURSES(ptr_win)->win_input, 0, 0);
                     if (dcc_selected)
                     {
                         switch (dcc_selected->status)
                         {
-                            case DCC_WAITING:
-                                if (DCC_IS_RECV(dcc_selected->type))
+                            case IRC_DCC_WAITING:
+                                if (IRC_DCC_IS_RECV(dcc_selected->type))
                                     gui_window_wprintw (GUI_CURSES(ptr_win)->win_input,
                                                         _("  [A] Accept"));
                                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_input,
                                                     _("  [C] Cancel"));
                                 break;
-                            case DCC_CONNECTING:
-                            case DCC_ACTIVE:
+                            case IRC_DCC_CONNECTING:
+                            case IRC_DCC_ACTIVE:
                                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_input,
                                                     _("  [C] Cancel"));
                                 break;
-                            case DCC_DONE:
-                            case DCC_FAILED:
-                            case DCC_ABORTED:
+                            case IRC_DCC_DONE:
+                            case IRC_DCC_FAILED:
+                            case IRC_DCC_ABORTED:
                                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_input,
                                                     _("  [R] Remove"));
                                 break;
@@ -479,7 +479,7 @@ gui_input_draw (t_gui_buffer *buffer, int erase)
                     if (ptr_win == gui_current_window)
                         move (ptr_win->win_input_y, ptr_win->win_input_x);
                     break;
-                case BUFFER_TYPE_RAW_DATA:
+                case GUI_BUFFER_TYPE_RAW_DATA:
                     wmove (GUI_CURSES(ptr_win)->win_input, 0, 0);
                     gui_window_wprintw (GUI_CURSES(ptr_win)->win_input,
                                         _("  [C] Clear buffer"));
diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c
index a04463b40..479112221 100644
--- a/src/gui/curses/gui-curses-keyboard.c
+++ b/src/gui/curses/gui-curses-keyboard.c
@@ -282,7 +282,7 @@ gui_keyboard_read ()
         
         /*gui_printf (gui_current_window->buffer, "gui_input_read: key = %s (%d)\n", key_str, key);*/
         
-        if (gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED)
+        if (gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
             input_old = (gui_current_window->buffer->input_buffer) ?
                 strdup (gui_current_window->buffer->input_buffer) : strdup ("");
         else
@@ -297,22 +297,22 @@ gui_keyboard_read ()
             
             switch (gui_current_window->buffer->type)
             {
-                case BUFFER_TYPE_STANDARD:
+                case GUI_BUFFER_TYPE_STANDARD:
                     gui_insert_string_input (gui_current_window, key_str, -1);
                     gui_current_window->buffer->completion.position = -1;
                     input_draw = 1;
                     break;
-                case BUFFER_TYPE_DCC:
+                case GUI_BUFFER_TYPE_DCC:
                     gui_exec_action_dcc (gui_current_window, key_str);
                     break;
-                case BUFFER_TYPE_RAW_DATA:
+                case GUI_BUFFER_TYPE_RAW_DATA:
                     gui_exec_action_raw_data (gui_current_window, key_str);
                     break;
             }
         }
         
         /* incremental text search in buffer */
-        if ((gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED)
+        if ((gui_current_window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
             && ((input_old == NULL) || (gui_current_window->buffer->input_buffer == NULL)
                 || (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0)))
         {
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index f4066b836..29d09c68f 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -83,7 +83,7 @@ gui_main_loop ()
     
     old_min = -1;
     old_sec = -1;
-    check_away = 0;
+    irc_check_away = 0;
     
     /* if SIGTERM or SIGHUP received => quit */
     signal (SIGTERM, gui_main_quit);
@@ -114,7 +114,7 @@ gui_main_loop ()
                 for (ptr_buffer = gui_buffers; ptr_buffer;
                      ptr_buffer = ptr_buffer->next_buffer)
                 {
-                    if (ptr_buffer->type == BUFFER_TYPE_STANDARD)
+                    if (ptr_buffer->type == GUI_BUFFER_TYPE_STANDARD)
                         gui_printf_nolog_notime (ptr_buffer,
                                                  _("Day changed to %s\n"),
                                                  (text_time2) ?
@@ -165,10 +165,10 @@ gui_main_loop ()
             /* away check */
             if (cfg_irc_away_check != 0)
             {
-                check_away++;
-                if (check_away >= (cfg_irc_away_check * 60))
+                irc_check_away++;
+                if (irc_check_away >= (cfg_irc_away_check * 60))
                 {
-                    check_away = 0;
+                    irc_check_away = 0;
                     irc_server_check_away ();
                 }
             }
@@ -243,7 +243,7 @@ gui_main_loop ()
                         diff = (int) get_timeval_diff (&(ptr_server->lag_check_time), &tv);
                         if (diff / 1000 > cfg_irc_lag_disconnect * 60)
                         {
-                            irc_display_prefix (ptr_server, ptr_server->buffer, PREFIX_ERROR);
+                            irc_display_prefix (ptr_server, ptr_server->buffer, GUI_PREFIX_ERROR);
                             gui_printf (ptr_server->buffer,
                                         _("%s lag is high, disconnecting from server...\n"),
                                         WEECHAT_WARNING);
@@ -340,7 +340,7 @@ gui_main_init ()
     if (gui_window_new (NULL, 0, 0, COLS, LINES, 100, 100))
     {
         gui_current_window = gui_windows;
-        gui_buffer_new (gui_windows, NULL, NULL, BUFFER_TYPE_STANDARD, 1);
+        gui_buffer_new (gui_windows, NULL, NULL, GUI_BUFFER_TYPE_STANDARD, 1);
         
         if (cfg_look_set_title)
             gui_window_set_title ();
diff --git a/src/gui/curses/gui-curses-nicklist.c b/src/gui/curses/gui-curses-nicklist.c
index 71ff500d7..ee425116c 100644
--- a/src/gui/curses/gui-curses-nicklist.c
+++ b/src/gui/curses/gui-curses-nicklist.c
@@ -46,14 +46,14 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
     char format_empty[32], *buf, *ptr_buf, *ptr_next, saved_char;
     t_irc_nick *ptr_nick;
     
-    if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
+    if (!gui_ok || !GUI_BUFFER_HAS_NICKLIST(buffer))
         return;
     
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
         if ((ptr_win->buffer == buffer) && (buffer->num_displayed > 0))
         {
-            max_length = irc_nick_get_max_length (CHANNEL(buffer));
+            max_length = irc_nick_get_max_length (GUI_CHANNEL(buffer));
             
             if (calculate_size && (gui_window_calculate_pos_size (ptr_win, 0)))
             {
@@ -73,7 +73,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
             
             if (erase)
             {
-                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK);
+                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK);
                 
                 snprintf (format_empty, 32, "%%-%ds", ptr_win->win_nick_width);
                 for (i = 0; i < ptr_win->win_nick_height; i++)
@@ -95,7 +95,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
             
             if (cfg_look_nicklist_separator && has_colors ())
             {
-                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_SEP);
+                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_SEP);
                 switch (cfg_look_nicklist_position)
                 {
                     case CFG_LOOK_NICKLIST_LEFT:
@@ -121,7 +121,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
                 }
             }
             
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK);
             x = 0;
             y = (cfg_look_nicklist_separator && (cfg_look_nicklist_position == CFG_LOOK_NICKLIST_BOTTOM)) ? 1 : 0;
             max_y = 0;
@@ -146,7 +146,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
             else
                 nicks_displayed = ptr_win->win_nick_height;
             
-            ptr_nick = CHANNEL(buffer)->nicks;
+            ptr_nick = GUI_CHANNEL(buffer)->nicks;
             for (i = 0; i < ptr_win->win_nick_start; i++)
             {
                 if (!ptr_nick)
@@ -173,64 +173,64 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
                     if ( ((i == 0) && (ptr_win->win_nick_start > 0))
                          || ((i == nicks_displayed - 1) && (ptr_nick->next_nick)) )
                     {
-                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_MORE);
+                        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_MORE);
                         j = (max_length + 1) >= 4 ? 4 : max_length + 1;
                         for (x2 = 1; x2 <= j; x2++)
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x + x2, "+");
                     }
                     else
                     {
-                        if (ptr_nick->flags & NICK_CHANOWNER)
+                        if (ptr_nick->flags & IRC_NICK_CHANOWNER)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_CHANOWNER);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_CHANOWNER);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "~");
                             x++;
                         }
-                        else if (ptr_nick->flags & NICK_CHANADMIN)
+                        else if (ptr_nick->flags & IRC_NICK_CHANADMIN)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_CHANADMIN);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_CHANADMIN);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "&");
                             x++;
                         }
-                        else if (ptr_nick->flags & NICK_CHANADMIN2)
+                        else if (ptr_nick->flags & IRC_NICK_CHANADMIN2)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_CHANADMIN);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_CHANADMIN);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "!");
                             x++;
                         }
-                        else if (ptr_nick->flags & NICK_OP)
+                        else if (ptr_nick->flags & IRC_NICK_OP)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_OP);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_OP);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "@");
                             x++;
                         }
-                        else if (ptr_nick->flags & NICK_HALFOP)
+                        else if (ptr_nick->flags & IRC_NICK_HALFOP)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_HALFOP);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_HALFOP);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "%%");
                             x++;
                         }
-                        else if (ptr_nick->flags & NICK_VOICE)
+                        else if (ptr_nick->flags & IRC_NICK_VOICE)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_VOICE);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_VOICE);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "+");
                             x++;
                         }
-                        else if (ptr_nick->flags & NICK_CHANUSER)
+                        else if (ptr_nick->flags & IRC_NICK_CHANUSER)
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK_CHANUSER);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK_CHANUSER);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, "-");
                             x++;
                         }
                         else
                         {
-                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, COLOR_WIN_NICK);
+                            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick, GUI_COLOR_WIN_NICK);
                             mvwprintw (GUI_CURSES(ptr_win)->win_nick, y, x, " ");
                             x++;
                         }
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_nick,
-                                                      ((cfg_irc_away_check > 0) && (ptr_nick->flags & NICK_AWAY)) ?
-                                                      COLOR_WIN_NICK_AWAY : COLOR_WIN_NICK);
+                                                      ((cfg_irc_away_check > 0) && (ptr_nick->flags & IRC_NICK_AWAY)) ?
+                                                      GUI_COLOR_WIN_NICK_AWAY : GUI_COLOR_WIN_NICK);
                         wmove (GUI_CURSES(ptr_win)->win_nick, y, x);
                         ptr_buf = ptr_nick->nick;
                         saved_char = '\0';
diff --git a/src/gui/curses/gui-curses-status.c b/src/gui/curses/gui-curses-status.c
index 3624c7b27..f5b1821fb 100644
--- a/src/gui/curses/gui-curses-status.c
+++ b/src/gui/curses/gui-curses-status.c
@@ -56,20 +56,20 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
     for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
     {
         if (erase)
-            gui_window_curses_clear (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS);
+            gui_window_curses_clear (GUI_CURSES(ptr_win)->win_status, GUI_COLOR_WIN_STATUS);
         
-        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS);
+        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, GUI_COLOR_WIN_STATUS);
         
         /* display number of buffers */
         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                                      GUI_COLOR_WIN_STATUS_DELIMITERS);
         mvwprintw (GUI_CURSES(ptr_win)->win_status, 0, 0, "[");
         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                      COLOR_WIN_STATUS);
+                                      GUI_COLOR_WIN_STATUS);
         wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                  (last_gui_buffer) ? last_gui_buffer->number : 0);
         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                      COLOR_WIN_STATUS_DELIMITERS);
+                                      GUI_COLOR_WIN_STATUS_DELIMITERS);
         wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
         
         /* display "<servers>" or current server */
@@ -77,157 +77,161 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
         {
             wprintw (GUI_CURSES(ptr_win)->win_status, "[");
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS);
+                                          GUI_COLOR_WIN_STATUS);
             gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, _("<servers>"));
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
         }
-        else if (SERVER(ptr_win->buffer) && SERVER(ptr_win->buffer)->name)
+        else if (GUI_SERVER(ptr_win->buffer) && GUI_SERVER(ptr_win->buffer)->name)
         {
             wprintw (GUI_CURSES(ptr_win)->win_status, "[");
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS);
-            wprintw (GUI_CURSES(ptr_win)->win_status, "%s", SERVER(ptr_win->buffer)->name);
-            if (SERVER(ptr_win->buffer)->is_away)
+                                          GUI_COLOR_WIN_STATUS);
+            wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
+                     GUI_SERVER(ptr_win->buffer)->name);
+            if (GUI_SERVER(ptr_win->buffer)->is_away)
                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, _("(away)"));
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
         }
         
         /* infos about current server buffer */
-        if (SERVER(ptr_win->buffer) && !CHANNEL(ptr_win->buffer))
+        if (GUI_SERVER(ptr_win->buffer) && !GUI_CHANNEL(ptr_win->buffer))
         {
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS);
+                                          GUI_COLOR_WIN_STATUS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                      ptr_win->buffer->number);
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, ":");
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_CHANNEL);
-            if (SERVER(ptr_win->buffer)->is_connected)
+                                          GUI_COLOR_WIN_STATUS_CHANNEL);
+            if (GUI_SERVER(ptr_win->buffer)->is_connected)
             {
-                if ((ptr_win->buffer->all_servers) && (SERVER(ptr_win->buffer)->is_away))
+                if ((ptr_win->buffer->all_servers) && (GUI_SERVER(ptr_win->buffer)->is_away))
                 {
                     wprintw (GUI_CURSES(ptr_win)->win_status, "[%s",
-                             SERVER(ptr_win->buffer)->name);
+                             GUI_SERVER(ptr_win->buffer)->name);
                     wprintw (GUI_CURSES(ptr_win)->win_status, _("(away)"));
                     wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
                 }
                 else
                     wprintw (GUI_CURSES(ptr_win)->win_status, "[%s] ",
-                             SERVER(ptr_win->buffer)->name);
+                             GUI_SERVER(ptr_win->buffer)->name);
             }
             else
                 wprintw (GUI_CURSES(ptr_win)->win_status, "(%s) ",
-                         SERVER(ptr_win->buffer)->name);
+                         GUI_SERVER(ptr_win->buffer)->name);
             if (ptr_win->buffer->all_servers)
             {
-                irc_server_get_number_buffer (SERVER(ptr_win->buffer),
+                irc_server_get_number_buffer (GUI_SERVER(ptr_win->buffer),
                                               &server_pos,
                                               &server_total);
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                                              GUI_COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, "(");
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS);
+                                              GUI_COLOR_WIN_STATUS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, "%d", server_pos);
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                                              GUI_COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, "/");
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS);
+                                              GUI_COLOR_WIN_STATUS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, "%d", server_total);
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                                              GUI_COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, ") ");
 
             }
         }
 
         /* infos about current channel/pv buffer */
-        if (SERVER(ptr_win->buffer) && CHANNEL(ptr_win->buffer))
+        if (GUI_SERVER(ptr_win->buffer) && GUI_CHANNEL(ptr_win->buffer))
         {
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS);
+                                          GUI_COLOR_WIN_STATUS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                      ptr_win->buffer->number);
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, ":");
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_CHANNEL);
-            if (((CHANNEL(ptr_win->buffer)->type == CHANNEL_TYPE_CHANNEL)
-                 && (!CHANNEL(ptr_win->buffer)->nicks))
-                || ((CHANNEL(ptr_win->buffer)->type == CHANNEL_TYPE_DCC_CHAT)
-                    && (CHANNEL(ptr_win->buffer)->dcc_chat)
-                    && (((t_irc_dcc *)(CHANNEL(ptr_win->buffer)->dcc_chat))->sock < 0)))
+                                          GUI_COLOR_WIN_STATUS_CHANNEL);
+            if (((GUI_CHANNEL(ptr_win->buffer)->type == IRC_CHANNEL_TYPE_CHANNEL)
+                 && (!GUI_CHANNEL(ptr_win->buffer)->nicks))
+                || ((GUI_CHANNEL(ptr_win->buffer)->type == IRC_CHANNEL_TYPE_DCC_CHAT)
+                    && (GUI_CHANNEL(ptr_win->buffer)->dcc_chat)
+                    && (((t_irc_dcc *)(GUI_CHANNEL(ptr_win->buffer)->dcc_chat))->sock < 0)))
                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "(%s)",
-                                    CHANNEL(ptr_win->buffer)->name);
+                                    GUI_CHANNEL(ptr_win->buffer)->name);
             else
                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
-                                    CHANNEL(ptr_win->buffer)->name);
-            if (ptr_win->buffer == CHANNEL(ptr_win->buffer)->buffer)
+                                    GUI_CHANNEL(ptr_win->buffer)->name);
+            if (ptr_win->buffer == GUI_CHANNEL(ptr_win->buffer)->buffer)
             {
                 /* display channel modes */
-                if (CHANNEL(ptr_win->buffer)->type == CHANNEL_TYPE_CHANNEL)
+                if (GUI_CHANNEL(ptr_win->buffer)->type == IRC_CHANNEL_TYPE_CHANNEL)
                 {
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS_DELIMITERS);
+                                                  GUI_COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (GUI_CURSES(ptr_win)->win_status, "(");
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS);
-                    if (CHANNEL(ptr_win->buffer)->modes
-                        && (strcmp (CHANNEL(ptr_win->buffer)->modes, "+") != 0))
+                                                  GUI_COLOR_WIN_STATUS);
+                    if (GUI_CHANNEL(ptr_win->buffer)->modes
+                        && (strcmp (GUI_CHANNEL(ptr_win->buffer)->modes, "+") != 0))
                         gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, "%s",
-                                            CHANNEL(ptr_win->buffer)->modes);
+                                            GUI_CHANNEL(ptr_win->buffer)->modes);
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS_DELIMITERS);
+                                                  GUI_COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (GUI_CURSES(ptr_win)->win_status, ")");
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS);
+                                                  GUI_COLOR_WIN_STATUS);
                 }
                 
                 /* display DCC if private is DCC CHAT */
-                if (CHANNEL(ptr_win->buffer)->type == CHANNEL_TYPE_DCC_CHAT)
+                if (GUI_CHANNEL(ptr_win->buffer)->type == IRC_CHANNEL_TYPE_DCC_CHAT)
                 {
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS_DELIMITERS);
+                                                  GUI_COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (GUI_CURSES(ptr_win)->win_status, "(");
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS_CHANNEL);
+                                                  GUI_COLOR_WIN_STATUS_CHANNEL);
                     wprintw (GUI_CURSES(ptr_win)->win_status, "DCC");
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS_DELIMITERS);
+                                                  GUI_COLOR_WIN_STATUS_DELIMITERS);
                     wprintw (GUI_CURSES(ptr_win)->win_status, ")");
                     gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                  COLOR_WIN_STATUS);
+                                                  GUI_COLOR_WIN_STATUS);
                 }
             }
             wprintw (GUI_CURSES(ptr_win)->win_status, " ");
         }
-        if (!SERVER(ptr_win->buffer))
+        if (!GUI_SERVER(ptr_win->buffer))
         {
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
+                                          GUI_COLOR_WIN_STATUS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                      ptr_win->buffer->number);
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS_DELIMITERS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, ":");
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS_CHANNEL);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
+                                          GUI_COLOR_WIN_STATUS_CHANNEL);
             switch (ptr_win->buffer->type)
             {
-                case BUFFER_TYPE_STANDARD:
+                case GUI_BUFFER_TYPE_STANDARD:
                     gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                         _("[not connected] "));
                     break;
-                case BUFFER_TYPE_DCC:
+                case GUI_BUFFER_TYPE_DCC:
                     gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                         "<DCC> ");
                     break;
-                case BUFFER_TYPE_RAW_DATA:
+                case GUI_BUFFER_TYPE_RAW_DATA:
                     gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                         _("<RAW_IRC> "));
                     break;
@@ -238,9 +242,9 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
         if (weechat_hotlist)
         {
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "[");
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, GUI_COLOR_WIN_STATUS);
             gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, _("Act: "));
             
             names_count = 0;
@@ -251,22 +255,22 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
                 {
                     case HOTLIST_LOW:
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS_DATA_OTHER);
+                                                      GUI_COLOR_WIN_STATUS_DATA_OTHER);
                         display_name = ((cfg_look_hotlist_names_level & 1) != 0);
                         break;
                     case HOTLIST_MSG:
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS_DATA_MSG);
+                                                      GUI_COLOR_WIN_STATUS_DATA_MSG);
                         display_name = ((cfg_look_hotlist_names_level & 2) != 0);
                         break;
                     case HOTLIST_PRIVATE:
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS_DATA_PRIVATE);
+                                                      GUI_COLOR_WIN_STATUS_DATA_PRIVATE);
                         display_name = ((cfg_look_hotlist_names_level & 4) != 0);
                         break;
                     case HOTLIST_HIGHLIGHT:
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS_DATA_HIGHLIGHT);
+                                                      GUI_COLOR_WIN_STATUS_DATA_HIGHLIGHT);
                         display_name = ((cfg_look_hotlist_names_level & 8) != 0);
                         break;
                     default:
@@ -275,7 +279,7 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
                 }
                 switch (ptr_hotlist->buffer->type)
                 {
-                    case BUFFER_TYPE_STANDARD:
+                    case GUI_BUFFER_TYPE_STANDARD:
                         wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                                  ptr_hotlist->buffer->number);
                         
@@ -285,47 +289,47 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
                             names_count++;
                             
                             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                          COLOR_WIN_STATUS_DELIMITERS);
+                                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
                             wprintw (GUI_CURSES(ptr_win)->win_status, ":");
                             
                             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                          COLOR_WIN_STATUS);
+                                                          GUI_COLOR_WIN_STATUS);
                             if (cfg_look_hotlist_names_length == 0)
                                 snprintf (format, sizeof (format) - 1, "%%s");
                             else
                                 snprintf (format, sizeof (format) - 1, "%%.%ds", cfg_look_hotlist_names_length);
-                            if (BUFFER_IS_SERVER(ptr_hotlist->buffer))
+                            if (GUI_BUFFER_IS_SERVER(ptr_hotlist->buffer))
                                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                                     format,
                                                     (ptr_hotlist->server) ?
                                                     ptr_hotlist->server->name :
-                                                    SERVER(ptr_hotlist->buffer)->name);
-                            else if (BUFFER_IS_CHANNEL(ptr_hotlist->buffer)
-                                     || BUFFER_IS_PRIVATE(ptr_hotlist->buffer))
+                                                    GUI_SERVER(ptr_hotlist->buffer)->name);
+                            else if (GUI_BUFFER_IS_CHANNEL(ptr_hotlist->buffer)
+                                     || GUI_BUFFER_IS_PRIVATE(ptr_hotlist->buffer))
                                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                                     format,
-                                                    CHANNEL(ptr_hotlist->buffer)->name);
+                                                    GUI_CHANNEL(ptr_hotlist->buffer)->name);
                         }
                         break;
-                    case BUFFER_TYPE_DCC:
+                    case GUI_BUFFER_TYPE_DCC:
                         wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                                  ptr_hotlist->buffer->number);
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS_DELIMITERS);
+                                                      GUI_COLOR_WIN_STATUS_DELIMITERS);
                         wprintw (GUI_CURSES(ptr_win)->win_status, ":");
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS);
+                                                      GUI_COLOR_WIN_STATUS);
                         gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                             "DCC");
                         break;
-                    case BUFFER_TYPE_RAW_DATA:
+                    case GUI_BUFFER_TYPE_RAW_DATA:
                         wprintw (GUI_CURSES(ptr_win)->win_status, "%d",
                                  ptr_hotlist->buffer->number);
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS_DELIMITERS);
+                                                      GUI_COLOR_WIN_STATUS_DELIMITERS);
                         wprintw (GUI_CURSES(ptr_win)->win_status, ":");
                         gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                                      COLOR_WIN_STATUS);
+                                                      GUI_COLOR_WIN_STATUS);
                         gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                             _("RAW_IRC"));
                         break;
@@ -335,32 +339,33 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
                     wprintw (GUI_CURSES(ptr_win)->win_status, ",");
             }
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "] ");
         }
         
         /* display lag */
-        if (SERVER(ptr_win->buffer))
+        if (GUI_SERVER(ptr_win->buffer))
         {
-            if (SERVER(ptr_win->buffer)->lag / 1000 >= cfg_irc_lag_min_show)
+            if (GUI_SERVER(ptr_win->buffer)->lag / 1000 >= cfg_irc_lag_min_show)
             {
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                                              GUI_COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, "[");
-                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS);
+                gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, GUI_COLOR_WIN_STATUS);
                 gui_window_wprintw (GUI_CURSES(ptr_win)->win_status,
                                     _("Lag: %.1f"),
-                                    ((float)(SERVER(ptr_win->buffer)->lag)) / 1000);
+                                    ((float)(GUI_SERVER(ptr_win->buffer)->lag)) / 1000);
                 gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                              COLOR_WIN_STATUS_DELIMITERS);
+                                              GUI_COLOR_WIN_STATUS_DELIMITERS);
                 wprintw (GUI_CURSES(ptr_win)->win_status, "]");
             }
         }
         
         /* display "-MORE-" (if last line is not displayed) & nicks count */
-        if (BUFFER_HAS_NICKLIST(ptr_win->buffer))
+        if (GUI_BUFFER_HAS_NICKLIST(ptr_win->buffer))
         {
-            snprintf (str_nicks, sizeof (str_nicks) - 1, "%d", CHANNEL(ptr_win->buffer)->nicks_count);
+            snprintf (str_nicks, sizeof (str_nicks) - 1, "%d",
+                      GUI_CHANNEL(ptr_win->buffer)->nicks_count);
             x = ptr_win->win_status_width - utf8_strlen (str_nicks) - 4;
         }
         else
@@ -369,7 +374,7 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
         x -= utf8_strlen (more) - 1;
         if (x < 0)
             x = 0;
-        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS_MORE);
+        gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, GUI_COLOR_WIN_STATUS_MORE);
         if (ptr_win->scroll)
         {
             wmove (GUI_CURSES(ptr_win)->win_status, 0, x);
@@ -381,15 +386,15 @@ gui_status_draw (t_gui_buffer *buffer, int erase)
             wmove (GUI_CURSES(ptr_win)->win_status, 0, x);
             gui_window_wprintw (GUI_CURSES(ptr_win)->win_status, format, " ");
         }
-        if (BUFFER_HAS_NICKLIST(ptr_win->buffer))
+        if (GUI_BUFFER_HAS_NICKLIST(ptr_win->buffer))
         {
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, " [");
-            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, COLOR_WIN_STATUS);
+            gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status, GUI_COLOR_WIN_STATUS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "%s", str_nicks);
             gui_window_set_weechat_color (GUI_CURSES(ptr_win)->win_status,
-                                          COLOR_WIN_STATUS_DELIMITERS);
+                                          GUI_COLOR_WIN_STATUS_DELIMITERS);
             wprintw (GUI_CURSES(ptr_win)->win_status, "]");
         }
         free (more);
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index ae2096125..4d3cb509a 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -203,9 +203,9 @@ gui_window_calculate_pos_size (t_gui_window *window, int force_calculate)
     add_bottom = gui_panel_window_get_size (NULL, window, GUI_PANEL_BOTTOM);
     
     /* init chat & nicklist settings */
-    if (cfg_look_nicklist && BUFFER_IS_CHANNEL(window->buffer))
+    if (cfg_look_nicklist && GUI_BUFFER_IS_CHANNEL(window->buffer))
     {
-        max_length = irc_nick_get_max_length (CHANNEL(window->buffer));
+        max_length = irc_nick_get_max_length (GUI_CHANNEL(window->buffer));
         
         lines = 0;
         
@@ -223,7 +223,7 @@ gui_window_calculate_pos_size (t_gui_window *window, int force_calculate)
         }
         else
         {
-            irc_nick_count (CHANNEL(window->buffer), &num_nicks, &num_op,
+            irc_nick_count (GUI_CHANNEL(window->buffer), &num_nicks, &num_op,
                             &num_halfop, &num_voice, &num_normal);
             width_used = (window->win_width - add_left - add_right)
                 - ((window->win_width - add_left - add_right) % (max_length + 2));
@@ -394,7 +394,7 @@ gui_window_draw_separator (t_gui_window *window)
                                                     1,
                                                     window->win_y,
                                                     window->win_x - 1);
-        gui_window_set_weechat_color (GUI_CURSES(window)->win_separator, COLOR_WIN_SEPARATOR);
+        gui_window_set_weechat_color (GUI_CURSES(window)->win_separator, GUI_COLOR_WIN_SEPARATOR);
         wborder (GUI_CURSES(window)->win_separator, ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
         wnoutrefresh (GUI_CURSES(window)->win_separator);
         refresh ();
@@ -484,7 +484,7 @@ gui_window_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
                                             window->win_input_width,
                                             window->win_input_y,
                                             window->win_input_x);
-    if (BUFFER_IS_CHANNEL(buffer))
+    if (GUI_BUFFER_IS_CHANNEL(buffer))
     {
         if (GUI_CURSES(window)->win_chat)
             delwin (GUI_CURSES(window)->win_chat);
@@ -500,7 +500,7 @@ gui_window_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
         else
             GUI_CURSES(window)->win_nick = NULL;
     }
-    if (!(BUFFER_IS_CHANNEL(buffer)))
+    if (!GUI_BUFFER_IS_CHANNEL(buffer))
     {
         if (GUI_CURSES(window)->win_chat)
             delwin (GUI_CURSES(window)->win_chat);
@@ -759,7 +759,7 @@ gui_window_nick_beginning (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -781,10 +781,10 @@ gui_window_nick_end (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
         new_start =
-            CHANNEL(window->buffer)->nicks_count - window->win_nick_num_max;
+            GUI_CHANNEL(window->buffer)->nicks_count - window->win_nick_num_max;
         if (new_start < 0)
             new_start = 0;
         else if (new_start >= 1)
@@ -808,7 +808,7 @@ gui_window_nick_page_up (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -830,11 +830,11 @@ gui_window_nick_page_down (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
-        if ((CHANNEL(window->buffer)->nicks_count > window->win_nick_num_max)
+        if ((GUI_CHANNEL(window->buffer)->nicks_count > window->win_nick_num_max)
             && (window->win_nick_start + window->win_nick_num_max - 1
-                < CHANNEL(window->buffer)->nicks_count))
+                < GUI_CHANNEL(window->buffer)->nicks_count))
         {
             if (window->win_nick_start == 0)
                 window->win_nick_start += (window->win_nick_num_max - 1);
diff --git a/src/gui/gtk/gui-gtk-color.c b/src/gui/gtk/gui-gtk-color.c
index 1c40f00e1..f7ff20ed2 100644
--- a/src/gui/gtk/gui-gtk-color.c
+++ b/src/gui/gtk/gui-gtk-color.c
@@ -479,63 +479,7 @@ gui_color_init_pairs ()
 void
 gui_color_init_weechat ()
 {
-    int i;
-    
-    gui_color[COLOR_WIN_SEPARATOR] = gui_color_build (COLOR_WIN_SEPARATOR, cfg_col_separator, cfg_col_separator);
-    gui_color[COLOR_WIN_TITLE] = gui_color_build (COLOR_WIN_TITLE, cfg_col_title, cfg_col_title_bg);
-    gui_color[COLOR_WIN_CHAT] = gui_color_build (COLOR_WIN_CHAT, cfg_col_chat, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_TIME] = gui_color_build (COLOR_WIN_CHAT_TIME, cfg_col_chat_time, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_TIME_SEP] = gui_color_build (COLOR_WIN_CHAT_TIME_SEP, cfg_col_chat_time_sep, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_PREFIX1] = gui_color_build (COLOR_WIN_CHAT_PREFIX1, cfg_col_chat_prefix1, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_PREFIX2] = gui_color_build (COLOR_WIN_CHAT_PREFIX2, cfg_col_chat_prefix2, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_SERVER] = gui_color_build (COLOR_WIN_CHAT_SERVER, cfg_col_chat_server, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_JOIN] = gui_color_build (COLOR_WIN_CHAT_JOIN, cfg_col_chat_join, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_PART] = gui_color_build (COLOR_WIN_CHAT_PART, cfg_col_chat_part, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_NICK] = gui_color_build (COLOR_WIN_CHAT_NICK, cfg_col_chat_nick, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_HOST] = gui_color_build (COLOR_WIN_CHAT_HOST, cfg_col_chat_host, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_CHANNEL] = gui_color_build (COLOR_WIN_CHAT_CHANNEL, cfg_col_chat_channel, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_DARK] = gui_color_build (COLOR_WIN_CHAT_DARK, cfg_col_chat_dark, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_HIGHLIGHT] = gui_color_build (COLOR_WIN_CHAT_HIGHLIGHT, cfg_col_chat_highlight, cfg_col_chat_bg);
-    gui_color[COLOR_WIN_CHAT_READ_MARKER] = gui_color_build (COLOR_WIN_CHAT_READ_MARKER, cfg_col_chat_read_marker, cfg_col_chat_read_marker_bg);
-    gui_color[COLOR_WIN_STATUS] = gui_color_build (COLOR_WIN_STATUS, cfg_col_status, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DELIMITERS] = gui_color_build (COLOR_WIN_STATUS_DELIMITERS, cfg_col_status_delimiters, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_CHANNEL] = gui_color_build (COLOR_WIN_STATUS_CHANNEL, cfg_col_status_channel, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_MSG] = gui_color_build (COLOR_WIN_STATUS_DATA_MSG, cfg_col_status_data_msg, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_PRIVATE] = gui_color_build (COLOR_WIN_STATUS_DATA_PRIVATE, cfg_col_status_data_private, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_HIGHLIGHT] = gui_color_build (COLOR_WIN_STATUS_DATA_HIGHLIGHT, cfg_col_status_data_highlight, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_DATA_OTHER] = gui_color_build (COLOR_WIN_STATUS_DATA_OTHER, cfg_col_status_data_other, cfg_col_status_bg);
-    gui_color[COLOR_WIN_STATUS_MORE] = gui_color_build (COLOR_WIN_STATUS_MORE, cfg_col_status_more, cfg_col_status_bg);
-    gui_color[COLOR_WIN_INFOBAR] = gui_color_build (COLOR_WIN_INFOBAR, cfg_col_infobar, cfg_col_infobar_bg);
-    gui_color[COLOR_WIN_INFOBAR_DELIMITERS] = gui_color_build (COLOR_WIN_INFOBAR_DELIMITERS, cfg_col_infobar_delimiters, cfg_col_infobar_bg);
-    gui_color[COLOR_WIN_INFOBAR_HIGHLIGHT] = gui_color_build (COLOR_WIN_INFOBAR_HIGHLIGHT, cfg_col_infobar_highlight, cfg_col_infobar_bg);
-    gui_color[COLOR_WIN_INPUT] = gui_color_build (COLOR_WIN_INPUT, cfg_col_input, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_CHANNEL] = gui_color_build (COLOR_WIN_INPUT_CHANNEL, cfg_col_input_channel, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_NICK] = gui_color_build (COLOR_WIN_INPUT_NICK, cfg_col_input_nick, cfg_col_input_bg);
-    gui_color[COLOR_WIN_INPUT_DELIMITERS] = gui_color_build (COLOR_WIN_INPUT_DELIMITERS, cfg_col_input_delimiters, cfg_col_input_bg);
-    gui_color[COLOR_WIN_NICK] = gui_color_build (COLOR_WIN_NICK, cfg_col_nick, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_AWAY] = gui_color_build (COLOR_WIN_NICK_AWAY, cfg_col_nick_away, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_CHANOWNER] = gui_color_build (COLOR_WIN_NICK_CHANOWNER, cfg_col_nick_chanowner, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_CHANADMIN] = gui_color_build (COLOR_WIN_NICK_CHANADMIN, cfg_col_nick_chanadmin, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_OP] = gui_color_build (COLOR_WIN_NICK_OP, cfg_col_nick_op, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_HALFOP] = gui_color_build (COLOR_WIN_NICK_HALFOP, cfg_col_nick_halfop, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_VOICE] = gui_color_build (COLOR_WIN_NICK_VOICE, cfg_col_nick_voice, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_MORE] = gui_color_build (COLOR_WIN_NICK_MORE, cfg_col_nick_more, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_SEP] = gui_color_build (COLOR_WIN_NICK_SEP, cfg_col_nick_sep, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_SELF] = gui_color_build (COLOR_WIN_NICK_SELF, cfg_col_nick_self, cfg_col_nick_bg);
-    gui_color[COLOR_WIN_NICK_PRIVATE] = gui_color_build (COLOR_WIN_NICK_PRIVATE, cfg_col_nick_private, cfg_col_nick_bg);
-
-    for (i = 0; i < COLOR_WIN_NICK_NUMBER; i++)
-    {
-        gui_color[COLOR_WIN_NICK_1 + i] = gui_color_build (COLOR_WIN_NICK_1 + i, cfg_col_nick_colors[i], cfg_col_chat_bg);
-    }
-        
-    gui_color[COLOR_DCC_SELECTED] = gui_color_build (COLOR_DCC_SELECTED, cfg_col_dcc_selected, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_WAITING] = gui_color_build (COLOR_DCC_WAITING, cfg_col_dcc_waiting, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_CONNECTING] = gui_color_build (COLOR_DCC_CONNECTING, cfg_col_dcc_connecting, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_ACTIVE] = gui_color_build (COLOR_DCC_ACTIVE, cfg_col_dcc_active, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_DONE] = gui_color_build (COLOR_DCC_DONE, cfg_col_dcc_done, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_FAILED] = gui_color_build (COLOR_DCC_FAILED, cfg_col_dcc_failed, cfg_col_chat_bg);
-    gui_color[COLOR_DCC_ABORTED] = gui_color_build (COLOR_DCC_ABORTED, cfg_col_dcc_aborted, cfg_col_chat_bg);
+    /* TODO: write this function for Gtk */
 }
 
 /*
diff --git a/src/gui/gtk/gui-gtk-input.c b/src/gui/gtk/gui-gtk-input.c
index 67345ca1f..30c7c9318 100644
--- a/src/gui/gtk/gui-gtk-input.c
+++ b/src/gui/gtk/gui-gtk-input.c
@@ -71,20 +71,20 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick)
                 switch (pos[0])
                 {
                     case 'c':
-                        if (CHANNEL(window->buffer))
-                            length += utf8_strlen (CHANNEL(window->buffer)->name);
+                        if (GUI_CHANNEL(window->buffer))
+                            length += utf8_strlen (GUI_CHANNEL(window->buffer)->name);
                         else
                         {
-                            if (SERVER(window->buffer))
-                                length += utf8_strlen (SERVER(window->buffer)->name);
+                            if (GUI_SERVER(window->buffer))
+                                length += utf8_strlen (GUI_SERVER(window->buffer)->name);
                         }
                         pos++;
                         break;
                     case 'm':
-                        if (SERVER(window->buffer))
+                        if (GUI_SERVER(window->buffer))
                         {
                             mode_found = 0;
-                            for (modes = SERVER(window->buffer)->nick_modes;
+                            for (modes = GUI_SERVER(window->buffer)->nick_modes;
                                  modes && modes[0]; modes++)
                             {
                                 if (modes[0] != ' ')
diff --git a/src/gui/gtk/gui-gtk-main.c b/src/gui/gtk/gui-gtk-main.c
index e27bbc1de..ed0d9cb63 100644
--- a/src/gui/gtk/gui-gtk-main.c
+++ b/src/gui/gtk/gui-gtk-main.c
@@ -41,17 +41,17 @@
 #endif
 
 
-GtkWidget *gtk_main_window;
-GtkWidget *vbox1;
-GtkWidget *entry_topic;
-GtkWidget *notebook1;
-GtkWidget *vbox2;
-GtkWidget *hbox1;
-GtkWidget *hpaned1;
-GtkWidget *scrolledwindow_chat;
-GtkWidget *scrolledwindow_nick;
-GtkWidget *entry_input;
-GtkWidget *label1;
+GtkWidget *gui_gtk_main_window;
+GtkWidget *gui_gtk_vbox1;
+GtkWidget *gui_gtk_entry_topic;
+GtkWidget *gui_gtk_notebook1;
+GtkWidget *gui_gtk_vbox2;
+GtkWidget *gui_gtk_hbox1;
+GtkWidget *gui_gtk_hpaned1;
+GtkWidget *gui_gtk_scrolledwindow_chat;
+GtkWidget *gui_gtk_scrolledwindow_nick;
+GtkWidget *gui_gtk_entry_input;
+GtkWidget *gui_gtk_label1;
 
 
 /*
@@ -99,67 +99,74 @@ gui_main_init ()
     gdk_color_parse ("white", &color_fg);
     gdk_color_parse ("black", &color_bg);
     
-    gtk_main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title (GTK_WINDOW (gtk_main_window), PACKAGE_STRING);
+    gui_gtk_main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    gtk_window_set_title (GTK_WINDOW (gui_gtk_main_window), PACKAGE_STRING);
     
-    g_signal_connect (G_OBJECT (gtk_main_window), "destroy",  gtk_main_quit, NULL);
+    g_signal_connect (G_OBJECT (gui_gtk_main_window), "destroy", gtk_main_quit, NULL);
     
-    vbox1 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox1);
-    gtk_container_add (GTK_CONTAINER (gtk_main_window), vbox1);
+    gui_gtk_vbox1 = gtk_vbox_new (FALSE, 0);
+    gtk_widget_show (gui_gtk_vbox1);
+    gtk_container_add (GTK_CONTAINER (gui_gtk_main_window), gui_gtk_vbox1);
     
-    entry_topic = gtk_entry_new ();
-    gtk_widget_show (entry_topic);
-    gtk_box_pack_start (GTK_BOX (vbox1), entry_topic, FALSE, FALSE, 0);
-    gtk_widget_modify_text (entry_topic, GTK_STATE_NORMAL, &color_fg);
-    gtk_widget_modify_base (entry_topic, GTK_STATE_NORMAL, &color_bg);
+    gui_gtk_entry_topic = gtk_entry_new ();
+    gtk_widget_show (gui_gtk_entry_topic);
+    gtk_box_pack_start (GTK_BOX (gui_gtk_vbox1), gui_gtk_entry_topic, FALSE, FALSE, 0);
+    gtk_widget_modify_text (gui_gtk_entry_topic, GTK_STATE_NORMAL, &color_fg);
+    gtk_widget_modify_base (gui_gtk_entry_topic, GTK_STATE_NORMAL, &color_bg);
     
-    notebook1 = gtk_notebook_new ();
-    gtk_widget_show (notebook1);
-    gtk_box_pack_start (GTK_BOX (vbox1), notebook1, TRUE, TRUE, 0);
-    gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook1), GTK_POS_BOTTOM);
+    gui_gtk_notebook1 = gtk_notebook_new ();
+    gtk_widget_show (gui_gtk_notebook1);
+    gtk_box_pack_start (GTK_BOX (gui_gtk_vbox1), gui_gtk_notebook1, TRUE, TRUE, 0);
+    gtk_notebook_set_tab_pos (GTK_NOTEBOOK (gui_gtk_notebook1), GTK_POS_BOTTOM);
     
-    vbox2 = gtk_vbox_new (FALSE, 0);
-    gtk_widget_show (vbox2);
-    gtk_container_add (GTK_CONTAINER (notebook1), vbox2);
+    gui_gtk_vbox2 = gtk_vbox_new (FALSE, 0);
+    gtk_widget_show (gui_gtk_vbox2);
+    gtk_container_add (GTK_CONTAINER (gui_gtk_notebook1), gui_gtk_vbox2);
     
-    hbox1 = gtk_hbox_new (FALSE, 0);
-    gtk_widget_show (hbox1);
-    gtk_box_pack_start (GTK_BOX (vbox2), hbox1, TRUE, TRUE, 0);
+    gui_gtk_hbox1 = gtk_hbox_new (FALSE, 0);
+    gtk_widget_show (gui_gtk_hbox1);
+    gtk_box_pack_start (GTK_BOX (gui_gtk_vbox2), gui_gtk_hbox1, TRUE, TRUE, 0);
     
-    hpaned1 = gtk_hpaned_new ();
-    gtk_widget_show (hpaned1);
-    gtk_box_pack_start (GTK_BOX (hbox1), hpaned1, TRUE, TRUE, 0);
-    gtk_paned_set_position (GTK_PANED (hpaned1), 0);
+    gui_gtk_hpaned1 = gtk_hpaned_new ();
+    gtk_widget_show (gui_gtk_hpaned1);
+    gtk_box_pack_start (GTK_BOX (gui_gtk_hbox1), gui_gtk_hpaned1, TRUE, TRUE, 0);
+    gtk_paned_set_position (GTK_PANED (gui_gtk_hpaned1), 0);
     
-    scrolledwindow_chat = gtk_scrolled_window_new (NULL, NULL);
-    gtk_widget_show (scrolledwindow_chat);
-    gtk_paned_pack1 (GTK_PANED (hpaned1), scrolledwindow_chat, FALSE, TRUE);
+    gui_gtk_scrolledwindow_chat = gtk_scrolled_window_new (NULL, NULL);
+    gtk_widget_show (gui_gtk_scrolledwindow_chat);
+    gtk_paned_pack1 (GTK_PANED (gui_gtk_hpaned1), gui_gtk_scrolledwindow_chat,
+                     FALSE, TRUE);
     //gtk_box_pack_start (GTK_PANED (hpaned1), scrolledwindow_chat, TRUE, TRUE, 0);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow_chat), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-    gtk_widget_modify_text (scrolledwindow_chat, GTK_STATE_NORMAL, &color_fg);
-    gtk_widget_modify_base (scrolledwindow_chat, GTK_STATE_NORMAL, &color_bg);
-    
-    scrolledwindow_nick = gtk_scrolled_window_new (NULL, NULL);
-    gtk_widget_show (scrolledwindow_nick);
-    gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow_nick, FALSE, TRUE);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (gui_gtk_scrolledwindow_chat),
+                                    GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+    gtk_widget_modify_text (gui_gtk_scrolledwindow_chat, GTK_STATE_NORMAL, &color_fg);
+    gtk_widget_modify_base (gui_gtk_scrolledwindow_chat, GTK_STATE_NORMAL, &color_bg);
+    
+    gui_gtk_scrolledwindow_nick = gtk_scrolled_window_new (NULL, NULL);
+    gtk_widget_show (gui_gtk_scrolledwindow_nick);
+    gtk_paned_pack2 (GTK_PANED (gui_gtk_hpaned1), gui_gtk_scrolledwindow_nick,
+                     FALSE, TRUE);
     //gtk_box_pack_start (GTK_PANED (hpaned1), scrolledwindow_nick, TRUE, TRUE, 0);
-    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow_nick), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-    gtk_widget_modify_text (scrolledwindow_nick, GTK_STATE_NORMAL, &color_fg);
-    gtk_widget_modify_base (scrolledwindow_nick, GTK_STATE_NORMAL, &color_bg);
-    
-    entry_input = gtk_entry_new ();
-    gtk_widget_show (entry_input);
-    gtk_box_pack_start (GTK_BOX (vbox2), entry_input, FALSE, FALSE, 0);
-    gtk_widget_modify_text (entry_input, GTK_STATE_NORMAL, &color_fg);
-    gtk_widget_modify_base (entry_input, GTK_STATE_NORMAL, &color_bg);
-    
-    label1 = gtk_label_new (_("server"));
-    gtk_widget_show (label1);
-    gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label1);
-    gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
-    
-    gtk_widget_show_all (gtk_main_window);
+    gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (gui_gtk_scrolledwindow_nick),
+                                    GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
+    gtk_widget_modify_text (gui_gtk_scrolledwindow_nick, GTK_STATE_NORMAL, &color_fg);
+    gtk_widget_modify_base (gui_gtk_scrolledwindow_nick, GTK_STATE_NORMAL, &color_bg);
+    
+    gui_gtk_entry_input = gtk_entry_new ();
+    gtk_widget_show (gui_gtk_entry_input);
+    gtk_box_pack_start (GTK_BOX (gui_gtk_vbox2), gui_gtk_entry_input, FALSE,
+                        FALSE, 0);
+    gtk_widget_modify_text (gui_gtk_entry_input, GTK_STATE_NORMAL, &color_fg);
+    gtk_widget_modify_base (gui_gtk_entry_input, GTK_STATE_NORMAL, &color_bg);
+    
+    gui_gtk_label1 = gtk_label_new (_("server"));
+    gtk_widget_show (gui_gtk_label1);
+    gtk_notebook_set_tab_label (GTK_NOTEBOOK (gui_gtk_notebook1),
+                                gtk_notebook_get_nth_page (GTK_NOTEBOOK (gui_gtk_notebook1), 0),
+                                gui_gtk_label1);
+    gtk_label_set_justify (GTK_LABEL (gui_gtk_label1), GTK_JUSTIFY_LEFT);
+    
+    gtk_widget_show_all (gui_gtk_main_window);
     
     /* create new window/buffer */
     if (gui_window_new (NULL, 0, 0, 0, 0, 100, 100))
diff --git a/src/gui/gtk/gui-gtk-nicklist.c b/src/gui/gtk/gui-gtk-nicklist.c
index f70620990..aaf93c2c2 100644
--- a/src/gui/gtk/gui-gtk-nicklist.c
+++ b/src/gui/gtk/gui-gtk-nicklist.c
@@ -42,7 +42,7 @@ gui_nicklist_draw (t_gui_buffer *buffer, int erase, int calculate_size)
     char format[32], format_empty[32];
     t_irc_nick *ptr_nick;*/
     
-    if (!gui_ok || !BUFFER_HAS_NICKLIST(buffer))
+    if (!gui_ok || !GUI_BUFFER_HAS_NICKLIST(buffer))
         return;
     
     /* TODO: write this function for Gtk */
diff --git a/src/gui/gtk/gui-gtk-window.c b/src/gui/gtk/gui-gtk-window.c
index 43342599a..28f7ff03d 100644
--- a/src/gui/gtk/gui-gtk-window.c
+++ b/src/gui/gtk/gui-gtk-window.c
@@ -193,7 +193,7 @@ gui_window_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
     {
         GUI_GTK(window)->textview_chat = gtk_text_view_new ();
         gtk_widget_show (GUI_GTK(window)->textview_chat);
-        gtk_container_add (GTK_CONTAINER (scrolledwindow_chat), GUI_GTK(window)->textview_chat);
+        gtk_container_add (GTK_CONTAINER (gui_gtk_scrolledwindow_chat), GUI_GTK(window)->textview_chat);
         gtk_widget_set_size_request (GUI_GTK(window)->textview_chat, 300, -1);
         gtk_text_view_set_editable (GTK_TEXT_VIEW (GUI_GTK(window)->textview_chat), FALSE);
         gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (GUI_GTK(window)->textview_chat), FALSE);
@@ -205,11 +205,11 @@ gui_window_switch_to_buffer (t_gui_window *window, t_gui_buffer *buffer)
         gtk_text_buffer_get_bounds (GUI_GTK(window)->textbuffer_chat, &start, &end);
         gtk_text_buffer_apply_tag (GUI_GTK(window)->textbuffer_chat, GUI_GTK(window)->texttag_chat, &start, &end);
     }
-    if (BUFFER_IS_CHANNEL(buffer) && !GUI_GTK(window)->textbuffer_nicklist)
+    if (GUI_BUFFER_IS_CHANNEL(buffer) && !GUI_GTK(window)->textbuffer_nicklist)
     {
         GUI_GTK(window)->textview_nicklist = gtk_text_view_new ();
         gtk_widget_show (GUI_GTK(window)->textview_nicklist);
-        gtk_container_add (GTK_CONTAINER (scrolledwindow_nick), GUI_GTK(window)->textview_nicklist);
+        gtk_container_add (GTK_CONTAINER (gui_gtk_scrolledwindow_nick), GUI_GTK(window)->textview_nicklist);
         gtk_text_view_set_editable (GTK_TEXT_VIEW (GUI_GTK(window)->textview_nicklist), FALSE);
         gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (GUI_GTK(window)->textview_nicklist), FALSE);
         
@@ -421,7 +421,7 @@ gui_window_nick_beginning (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -443,10 +443,10 @@ gui_window_nick_end (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
         new_start =
-            CHANNEL(window->buffer)->nicks_count - window->win_nick_height;
+            GUI_CHANNEL(window->buffer)->nicks_count - window->win_nick_height;
         if (new_start < 0)
             new_start = 0;
         else if (new_start >= 1)
@@ -470,7 +470,7 @@ gui_window_nick_page_up (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
         if (window->win_nick_start > 0)
         {
@@ -492,11 +492,11 @@ gui_window_nick_page_down (t_gui_window *window)
     if (!gui_ok)
         return;
     
-    if (BUFFER_HAS_NICKLIST(window->buffer))
+    if (GUI_BUFFER_HAS_NICKLIST(window->buffer))
     {
-        if ((CHANNEL(window->buffer)->nicks_count > window->win_nick_height)
+        if ((GUI_CHANNEL(window->buffer)->nicks_count > window->win_nick_height)
             && (window->win_nick_start + window->win_nick_height - 1
-                < CHANNEL(window->buffer)->nicks_count))
+                < GUI_CHANNEL(window->buffer)->nicks_count))
         {
             if (window->win_nick_start == 0)
                 window->win_nick_start += (window->win_nick_height - 1);
diff --git a/src/gui/gtk/gui-gtk.h b/src/gui/gtk/gui-gtk.h
index 0aa008e01..cd04a0c9d 100644
--- a/src/gui/gtk/gui-gtk.h
+++ b/src/gui/gtk/gui-gtk.h
@@ -75,17 +75,17 @@ struct t_gui_gtk_objects
 extern t_gui_color gui_weechat_colors[];
 extern int gui_irc_colors[GUI_NUM_IRC_COLORS][2];
 
-extern GtkWidget *gtk_main_window;
-extern GtkWidget *vbox1;
-extern GtkWidget *entry_topic;
-extern GtkWidget *notebook1;
-extern GtkWidget *vbox2;
-extern GtkWidget *hbox1;
-extern GtkWidget *hpaned1;
-extern GtkWidget *scrolledwindow_chat;
-extern GtkWidget *scrolledwindow_nick;
-extern GtkWidget *entry_input;
-extern GtkWidget *label1;
+extern GtkWidget *gui_gtk_main_window;
+extern GtkWidget *gui_gtk_vbox1;
+extern GtkWidget *gui_gtk_entry_topic;
+extern GtkWidget *gui_gtk_notebook1;
+extern GtkWidget *gui_gtk_vbox2;
+extern GtkWidget *gui_gtk_hbox1;
+extern GtkWidget *gui_gtk_hpaned1;
+extern GtkWidget *gui_gtk_scrolledwindow_chat;
+extern GtkWidget *gui_gtk_scrolledwindow_nick;
+extern GtkWidget *gui_gtk_entry_input;
+extern GtkWidget *gui_gtk_label1;
 
 /* color functions */
 extern int gui_color_get_pair (int);
diff --git a/src/gui/gui-action.c b/src/gui/gui-action.c
index 69be9c6ac..e91ab362a 100644
--- a/src/gui/gui-action.c
+++ b/src/gui/gui-action.c
@@ -97,7 +97,7 @@ gui_action_return (t_gui_window *window, char *args)
     
     if (window->buffer->has_input)
     {
-        if (window->buffer->text_search != TEXT_SEARCH_DISABLED)
+        if (window->buffer->text_search != GUI_TEXT_SEARCH_DISABLED)
             gui_buffer_search_stop (window);
         else if (window->buffer->input_buffer_size > 0)
         {
@@ -118,7 +118,7 @@ gui_action_return (t_gui_window *window, char *args)
             window->buffer->ptr_history = NULL;
             gui_input_optimize_size (window->buffer);
             gui_input_draw (window->buffer, 0);
-            user_command (SERVER(window->buffer), CHANNEL(window->buffer),
+            user_command (GUI_SERVER(window->buffer), GUI_CHANNEL(window->buffer),
                           command, 0);
             free (command);
         }
@@ -136,7 +136,7 @@ gui_action_tab (t_gui_window *window, char *args)
     (void) args;
     
     if (window->buffer->has_input
-        && (window->buffer->text_search == TEXT_SEARCH_DISABLED))
+        && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
     {
         completion_search (&(window->buffer->completion), 1,
                            window->buffer->input_buffer,
@@ -158,7 +158,7 @@ gui_action_tab_previous (t_gui_window *window, char *args)
     (void) args;
     
     if (window->buffer->has_input
-        && (window->buffer->text_search == TEXT_SEARCH_DISABLED))
+        && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
     {
         completion_search (&(window->buffer->completion), -1,
                            window->buffer->input_buffer,
@@ -669,9 +669,9 @@ gui_action_up (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if (window->buffer->type == BUFFER_TYPE_DCC)
+    if (window->buffer->type == GUI_BUFFER_TYPE_DCC)
     {
-        if (dcc_list)
+        if (irc_dcc_list)
         {
             if (window->dcc_selected
                 && ((t_irc_dcc *)(window->dcc_selected))->prev_dcc)
@@ -689,7 +689,7 @@ gui_action_up (t_gui_window *window, char *args)
     }
     else if (window->buffer->has_input)
     {
-        if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+        if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
         {
             if (window->buffer->ptr_history)
             {
@@ -743,7 +743,7 @@ gui_action_up (t_gui_window *window, char *args)
         else
         {
             /* search backward in buffer history */
-            window->buffer->text_search = TEXT_SEARCH_BACKWARD;
+            window->buffer->text_search = GUI_TEXT_SEARCH_BACKWARD;
             (void) gui_buffer_search_text (window);
         }
     }
@@ -760,7 +760,7 @@ gui_action_up_global (t_gui_window *window, char *args)
     (void) args;
     
     if (window->buffer->has_input
-        && (window->buffer->text_search == TEXT_SEARCH_DISABLED))
+        && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
     {
         if (history_global_ptr)
         {
@@ -798,9 +798,9 @@ gui_action_down (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if (window->buffer->type == BUFFER_TYPE_DCC)
+    if (window->buffer->type == GUI_BUFFER_TYPE_DCC)
     {
-        if (dcc_list)
+        if (irc_dcc_list)
         {
             if (!window->dcc_selected
                 || ((t_irc_dcc *)(window->dcc_selected))->next_dcc)
@@ -814,14 +814,14 @@ gui_action_down (t_gui_window *window, char *args)
                             ((t_irc_dcc *)(window->dcc_first))->next_dcc;
                     else
                         window->dcc_first =
-                            dcc_list->next_dcc;
+                            irc_dcc_list->next_dcc;
                 }
                 if (window->dcc_selected)
                     window->dcc_selected =
                         ((t_irc_dcc *)(window->dcc_selected))->next_dcc;
                 else
                     window->dcc_selected =
-                        dcc_list->next_dcc;
+                        irc_dcc_list->next_dcc;
                 gui_chat_draw (window->buffer, 1);
                 gui_input_draw (window->buffer, 1);
             }
@@ -829,7 +829,7 @@ gui_action_down (t_gui_window *window, char *args)
     }
     else if (window->buffer->has_input)
     {
-        if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+        if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
         {
             if (window->buffer->ptr_history)
             {
@@ -880,7 +880,7 @@ gui_action_down (t_gui_window *window, char *args)
         else
         {
             /* search forward in buffer history */
-            window->buffer->text_search = TEXT_SEARCH_FORWARD;
+            window->buffer->text_search = GUI_TEXT_SEARCH_FORWARD;
             (void) gui_buffer_search_text (window);
         }
     }
@@ -897,7 +897,7 @@ gui_action_down_global (t_gui_window *window, char *args)
     (void) args;
     
     if (window->buffer->has_input
-        && (window->buffer->text_search == TEXT_SEARCH_DISABLED))
+        && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
     {
         if (history_global_ptr)
         {
@@ -1095,7 +1095,7 @@ gui_action_jump_smart (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
 
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
         if (weechat_hotlist)
         {
@@ -1126,9 +1126,9 @@ gui_action_jump_dcc (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
 
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
-        if (window->buffer->type == BUFFER_TYPE_DCC)
+        if (window->buffer->type == GUI_BUFFER_TYPE_DCC)
         {
             if (gui_buffer_before_dcc)
             {
@@ -1155,9 +1155,9 @@ gui_action_jump_raw_data (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
 
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
-        if (window->buffer->type == BUFFER_TYPE_RAW_DATA)
+        if (window->buffer->type == GUI_BUFFER_TYPE_RAW_DATA)
         {
             if (gui_buffer_before_raw_data)
             {
@@ -1184,7 +1184,7 @@ gui_action_jump_last_buffer (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
 
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
         if (last_gui_buffer)
             gui_buffer_switch_by_number (window, last_gui_buffer->number);
@@ -1202,7 +1202,7 @@ gui_action_jump_previous_buffer (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
         if (gui_previous_buffer)
             gui_buffer_switch_by_number (window, gui_previous_buffer->number);
@@ -1219,15 +1219,15 @@ gui_action_jump_server (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
-        if (SERVER(window->buffer))
+        if (GUI_SERVER(window->buffer))
         {
-            if (SERVER(window->buffer)->buffer !=
+            if (GUI_SERVER(window->buffer)->buffer !=
                 window->buffer)
             {
                 gui_window_switch_to_buffer (window,
-                                             SERVER(window->buffer)->buffer);
+                                             GUI_SERVER(window->buffer)->buffer);
                 gui_window_redraw_buffer (window->buffer);
             }
         }
@@ -1247,24 +1247,24 @@ gui_action_jump_next_server (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
-        if (SERVER(window->buffer))
+        if (GUI_SERVER(window->buffer))
         {
-            ptr_server = SERVER(window->buffer)->next_server;
+            ptr_server = GUI_SERVER(window->buffer)->next_server;
             if (!ptr_server)
                 ptr_server = irc_servers;
-            while (ptr_server != SERVER(window->buffer))
+            while (ptr_server != GUI_SERVER(window->buffer))
             {
                 if (ptr_server->buffer)
                     break;
                 ptr_server = (ptr_server->next_server) ?
                     ptr_server->next_server : irc_servers;
             }
-            if (ptr_server != SERVER(window->buffer))
+            if (ptr_server != GUI_SERVER(window->buffer))
             {
                 /* save current buffer */
-                SERVER(window->buffer)->saved_buffer = window->buffer;
+                GUI_SERVER(window->buffer)->saved_buffer = window->buffer;
                 
                 /* come back to memorized chan if found */
                 if (ptr_server->saved_buffer)
@@ -1308,8 +1308,8 @@ gui_action_scroll_previous_highlight (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if ((window->buffer->type == BUFFER_TYPE_STANDARD)
-        && (window->buffer->text_search == TEXT_SEARCH_DISABLED))
+    if ((window->buffer->type == GUI_BUFFER_TYPE_STANDARD)
+        && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
     {
         if (window->buffer->lines)
         {
@@ -1345,8 +1345,8 @@ gui_action_scroll_next_highlight (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if ((window->buffer->type == BUFFER_TYPE_STANDARD)
-        && (window->buffer->text_search == TEXT_SEARCH_DISABLED))
+    if ((window->buffer->type == GUI_BUFFER_TYPE_STANDARD)
+        && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED))
     {
         if (window->buffer->lines)
         {
@@ -1380,11 +1380,11 @@ gui_action_scroll_unread (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
 
-    if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
     {
         if (cfg_look_read_marker &&
             cfg_look_read_marker[0] &&
-            (window->buffer->type == BUFFER_TYPE_STANDARD) &&
+            (window->buffer->type == GUI_BUFFER_TYPE_STANDARD) &&
             window->buffer->last_read_line &&
             window->buffer->last_read_line != window->buffer->last_line)
         {
@@ -1415,7 +1415,7 @@ gui_action_set_unread (t_gui_window *window, char *args)
     for (ptr_buffer = gui_buffers; ptr_buffer;
          ptr_buffer = ptr_buffer->next_buffer)
     {
-        if (ptr_buffer->type == BUFFER_TYPE_STANDARD)
+        if (ptr_buffer->type == GUI_BUFFER_TYPE_STANDARD)
             ptr_buffer->last_read_line = ptr_buffer->last_line;
     }
     
@@ -1513,10 +1513,10 @@ gui_action_search_text (t_gui_window *window, char *args)
     /* make C compiler happy */
     (void) args;
     
-    if (window->buffer->type == BUFFER_TYPE_STANDARD)
+    if (window->buffer->type == GUI_BUFFER_TYPE_STANDARD)
     {
         /* toggle search */
-        if (window->buffer->text_search == TEXT_SEARCH_DISABLED)
+        if (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
             gui_buffer_search_start (window);
         else
         {
diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c
index ecd372d9e..04e16ad18 100644
--- a/src/gui/gui-buffer.c
+++ b/src/gui/gui-buffer.c
@@ -95,8 +95,8 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
 #endif
     
     /* use first buffer if no server is assigned to this buffer */
-    if ((type == BUFFER_TYPE_STANDARD) && gui_buffers
-        && (!SERVER(gui_buffers)) && (!channel))
+    if ((type == GUI_BUFFER_TYPE_STANDARD) && gui_buffers
+        && (!GUI_SERVER(gui_buffers)) && (!channel))
     {
         if (server)
             ((t_irc_server *)(server))->buffer = gui_buffers;
@@ -113,7 +113,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
     }
 
     /* use "all servers" buffer if found */
-    if (cfg_look_one_server_buffer && (type == BUFFER_TYPE_STANDARD) &&
+    if (cfg_look_one_server_buffer && (type == GUI_BUFFER_TYPE_STANDARD) &&
         gui_buffers && server && !channel)
     {
         ptr_buffer = gui_buffer_servers_search ();
@@ -138,18 +138,18 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
         new_buffer->all_servers = 0;
         new_buffer->channel = channel;
         new_buffer->type = type;
-        if (new_buffer->type == BUFFER_TYPE_RAW_DATA)
+        if (new_buffer->type == GUI_BUFFER_TYPE_RAW_DATA)
             gui_buffer_raw_data = new_buffer;
         /* assign buffer to server and channel */
         if (server && !channel)
         {
-            SERVER(new_buffer)->buffer = new_buffer;
+            GUI_SERVER(new_buffer)->buffer = new_buffer;
             new_buffer->all_servers = (cfg_look_one_server_buffer) ? 1 : 0;
         }
         if (!gui_buffers && cfg_look_one_server_buffer)
             new_buffer->all_servers = 1;
         if (channel)
-            CHANNEL(new_buffer)->buffer = new_buffer;
+            GUI_CHANNEL(new_buffer)->buffer = new_buffer;
         
         if (!window->buffer)
         {
@@ -173,18 +173,18 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
         /* create/append to log file */
         new_buffer->log_filename = NULL;
         new_buffer->log_file = NULL;
-        if ((cfg_log_auto_server && BUFFER_IS_SERVER(new_buffer))
-            || (cfg_log_auto_channel && BUFFER_IS_CHANNEL(new_buffer))
-            || (cfg_log_auto_private && BUFFER_IS_PRIVATE(new_buffer)))
+        if ((cfg_log_auto_server && GUI_BUFFER_IS_SERVER(new_buffer))
+            || (cfg_log_auto_channel && GUI_BUFFER_IS_CHANNEL(new_buffer))
+            || (cfg_log_auto_private && GUI_BUFFER_IS_PRIVATE(new_buffer)))
             gui_log_start (new_buffer);
         
         /* init input buffer */
-        new_buffer->has_input = (new_buffer->type == BUFFER_TYPE_STANDARD) ? 1 : 0;
+        new_buffer->has_input = (new_buffer->type == GUI_BUFFER_TYPE_STANDARD) ? 1 : 0;
         if (new_buffer->has_input)
         {
-            new_buffer->input_buffer_alloc = INPUT_BUFFER_BLOCK_SIZE;
-            new_buffer->input_buffer = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
-            new_buffer->input_buffer_color_mask = (char *) malloc (INPUT_BUFFER_BLOCK_SIZE);
+            new_buffer->input_buffer_alloc = GUI_INPUT_BUFFER_BLOCK_SIZE;
+            new_buffer->input_buffer = (char *) malloc (GUI_INPUT_BUFFER_BLOCK_SIZE);
+            new_buffer->input_buffer_color_mask = (char *) malloc (GUI_INPUT_BUFFER_BLOCK_SIZE);
             new_buffer->input_buffer[0] = '\0';
             new_buffer->input_buffer_color_mask[0] = '\0';
         }
@@ -208,7 +208,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
         new_buffer->num_history = 0;
         
         /* text search */
-        new_buffer->text_search = TEXT_SEARCH_DISABLED;
+        new_buffer->text_search = GUI_TEXT_SEARCH_DISABLED;
         new_buffer->text_search_exact = 0;
         new_buffer->text_search_found = 0;
         new_buffer->text_search_input = NULL;
@@ -225,7 +225,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
         /* move buffer next to server */
         if (server && cfg_look_open_near_server && (!cfg_look_one_server_buffer))
         {
-            ptr_buffer = SERVER(new_buffer)->buffer;
+            ptr_buffer = GUI_SERVER(new_buffer)->buffer;
             while (ptr_buffer && (ptr_buffer->server == server))
             {
                 ptr_buffer = ptr_buffer->next_buffer;
@@ -321,7 +321,7 @@ gui_buffer_search (char *server, char *channel)
     if (!ptr_buffer)
         return NULL;
     
-    return (ptr_buffer->type != BUFFER_TYPE_STANDARD) ?
+    return (ptr_buffer->type != GUI_BUFFER_TYPE_STANDARD) ?
         gui_buffers : ptr_buffer;
 }
 
@@ -463,13 +463,13 @@ gui_buffer_get_dcc (t_gui_window *window)
     /* check if dcc buffer exists */
     for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
     {
-        if (ptr_buffer->type == BUFFER_TYPE_DCC)
+        if (ptr_buffer->type == GUI_BUFFER_TYPE_DCC)
             break;
     }
     if (ptr_buffer)
         return ptr_buffer;
     else
-        return gui_buffer_new (window, NULL, NULL, BUFFER_TYPE_DCC, 0);
+        return gui_buffer_new (window, NULL, NULL, GUI_BUFFER_TYPE_DCC, 0);
 }
 
 /*
@@ -485,7 +485,7 @@ gui_buffer_clear (t_gui_buffer *buffer)
     if (!buffer)
         return;
 
-    if (buffer->type == BUFFER_TYPE_DCC)
+    if (buffer->type == GUI_BUFFER_TYPE_DCC)
         return;
     
     /* remove buffer from hotlist */
@@ -607,7 +607,7 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
     if (gui_buffer_before_raw_data == buffer)
         gui_buffer_before_raw_data = NULL;
     
-    if (buffer->type == BUFFER_TYPE_RAW_DATA)
+    if (buffer->type == GUI_BUFFER_TYPE_RAW_DATA)
         gui_buffer_raw_data = NULL;
     
     for (ptr_server = irc_servers; ptr_server;
@@ -668,7 +668,7 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another)
     /* always at least one buffer */
     if (!gui_buffers && create_new && switch_to_another)
         (void) gui_buffer_new (gui_windows, NULL, NULL,
-                               BUFFER_TYPE_STANDARD, 1);
+                               GUI_BUFFER_TYPE_STANDARD, 1);
     
     if (gui_windows && gui_current_window && gui_current_window->buffer)
         gui_status_draw (gui_current_window->buffer, 1);
@@ -766,7 +766,7 @@ gui_buffer_merge_servers (t_gui_window *window)
     for (ptr_buffer_server = gui_buffers; ptr_buffer_server;
          ptr_buffer_server = ptr_buffer_server->next_buffer)
     {
-        if (BUFFER_IS_SERVER(ptr_buffer_server))
+        if (GUI_BUFFER_IS_SERVER(ptr_buffer_server))
             break;
     }
     
@@ -778,9 +778,9 @@ gui_buffer_merge_servers (t_gui_window *window)
     while (ptr_buffer)
     {
         if ((ptr_buffer != ptr_buffer_server)
-            && (BUFFER_IS_SERVER(ptr_buffer)))
+            && (GUI_BUFFER_IS_SERVER(ptr_buffer)))
         {
-            ptr_server = SERVER(ptr_buffer);
+            ptr_server = GUI_SERVER(ptr_buffer);
             
             /* add (by pointer artefact) lines from buffer found to server buffer */
             if (ptr_buffer->lines)
@@ -833,18 +833,18 @@ gui_buffer_split_server (t_gui_window *window)
     
     if (ptr_buffer)
     {
-        if (SERVER(ptr_buffer))
+        if (GUI_SERVER(ptr_buffer))
         {
             for (ptr_server = irc_servers; ptr_server;
                  ptr_server = ptr_server->next_server)
             {
                 if (ptr_server->buffer
-                    && (ptr_server != SERVER(ptr_buffer))
+                    && (ptr_server != GUI_SERVER(ptr_buffer))
                     && (ptr_server->buffer == ptr_buffer))
                 {
                     ptr_server->buffer = NULL;
                     gui_buffer_new (window, ptr_server, NULL,
-                                    BUFFER_TYPE_STANDARD, 0);
+                                    GUI_BUFFER_TYPE_STANDARD, 0);
                 }
             }
         }
@@ -910,7 +910,7 @@ gui_buffer_switch_dcc (t_gui_window *window)
     /* check if dcc buffer exists */
     for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
     {
-        if (ptr_buffer->type == BUFFER_TYPE_DCC)
+        if (ptr_buffer->type == GUI_BUFFER_TYPE_DCC)
             break;
     }
     if (ptr_buffer)
@@ -919,7 +919,7 @@ gui_buffer_switch_dcc (t_gui_window *window)
         gui_window_redraw_buffer (ptr_buffer);
     }
     else
-        gui_buffer_new (window, NULL, NULL, BUFFER_TYPE_DCC, 1);
+        gui_buffer_new (window, NULL, NULL, GUI_BUFFER_TYPE_DCC, 1);
 }
 
 /*
@@ -934,7 +934,7 @@ gui_buffer_switch_raw_data (t_gui_window *window)
     /* check if raw IRC data buffer exists */
     for (ptr_buffer = gui_buffers; ptr_buffer; ptr_buffer = ptr_buffer->next_buffer)
     {
-        if (ptr_buffer->type == BUFFER_TYPE_RAW_DATA)
+        if (ptr_buffer->type == GUI_BUFFER_TYPE_RAW_DATA)
             break;
     }
     if (ptr_buffer)
@@ -943,7 +943,7 @@ gui_buffer_switch_raw_data (t_gui_window *window)
         gui_window_redraw_buffer (ptr_buffer);
     }
     else
-        gui_buffer_new (window, NULL, NULL, BUFFER_TYPE_RAW_DATA, 1);
+        gui_buffer_new (window, NULL, NULL, GUI_BUFFER_TYPE_RAW_DATA, 1);
 }
 
 /*
@@ -1090,7 +1090,7 @@ gui_buffer_search_text (t_gui_window *window)
 {
     t_gui_line *ptr_line;
     
-    if (window->buffer->text_search == TEXT_SEARCH_BACKWARD)
+    if (window->buffer->text_search == GUI_TEXT_SEARCH_BACKWARD)
     {
         if (window->buffer->lines
             && window->buffer->input_buffer && window->buffer->input_buffer[0])
@@ -1114,7 +1114,7 @@ gui_buffer_search_text (t_gui_window *window)
             }
         }
     }
-    else if (window->buffer->text_search == TEXT_SEARCH_FORWARD)
+    else if (window->buffer->text_search == GUI_TEXT_SEARCH_FORWARD)
     {
         if (window->buffer->lines
             && window->buffer->input_buffer && window->buffer->input_buffer[0])
@@ -1148,7 +1148,7 @@ gui_buffer_search_text (t_gui_window *window)
 void
 gui_buffer_search_start (t_gui_window *window)
 {
-    window->buffer->text_search = TEXT_SEARCH_BACKWARD;
+    window->buffer->text_search = GUI_TEXT_SEARCH_BACKWARD;
     window->buffer->text_search_exact = 0;
     window->buffer->text_search_found = 0;
     if (window->buffer->text_search_input)
@@ -1174,7 +1174,7 @@ gui_buffer_search_restart (t_gui_window *window)
 {
     window->start_line = NULL;
     window->start_line_pos = 0;
-    window->buffer->text_search = TEXT_SEARCH_BACKWARD;
+    window->buffer->text_search = GUI_TEXT_SEARCH_BACKWARD;
     window->buffer->text_search_found = 0;
     if (gui_buffer_search_text (window))
         window->buffer->text_search_found = 1;
@@ -1192,7 +1192,7 @@ gui_buffer_search_restart (t_gui_window *window)
 void
 gui_buffer_search_stop (t_gui_window *window)
 {
-    window->buffer->text_search = TEXT_SEARCH_DISABLED;
+    window->buffer->text_search = GUI_TEXT_SEARCH_DISABLED;
     window->buffer->text_search = 0;
     gui_action_delete_line (window, NULL);
     if (window->buffer->text_search_input)
diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h
index 98c0a9877..f1db925f0 100644
--- a/src/gui/gui-buffer.h
+++ b/src/gui/gui-buffer.h
@@ -23,36 +23,49 @@
 #include "../common/completion.h"
 #include "../common/history.h"
 
-#define BUFFER_TYPE_STANDARD    0
-#define BUFFER_TYPE_DCC         1
-#define BUFFER_TYPE_RAW_DATA    2
-
-#define SERVER(buffer)  ((t_irc_server *)(buffer->server))
-#define CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
-
-#define BUFFER_IS_SERVER(buffer)  ((SERVER(buffer) || (buffer->all_servers)) && !CHANNEL(buffer))
-#define BUFFER_IS_CHANNEL(buffer) (CHANNEL(buffer) && (CHANNEL(buffer)->type == CHANNEL_TYPE_CHANNEL))
-#define BUFFER_IS_PRIVATE(buffer) (CHANNEL(buffer) && \
-                                  ((CHANNEL(buffer)->type == CHANNEL_TYPE_PRIVATE) \
-                                  || (CHANNEL(buffer)->type == CHANNEL_TYPE_DCC_CHAT)))
-
-#define BUFFER_HAS_NICKLIST(buffer) (BUFFER_IS_CHANNEL(buffer))
-
-#define MSG_TYPE_TIME      1
-#define MSG_TYPE_PREFIX    2
-#define MSG_TYPE_NICK      4
-#define MSG_TYPE_INFO      8
-#define MSG_TYPE_MSG       16
-#define MSG_TYPE_HIGHLIGHT 32
-#define MSG_TYPE_NOLOG     64
-
-#define NOTIFY_LEVEL_MIN        0
-#define NOTIFY_LEVEL_MAX        3
-#define NOTIFY_LEVEL_DEFAULT    NOTIFY_LEVEL_MAX
-
-#define TEXT_SEARCH_DISABLED    0
-#define TEXT_SEARCH_BACKWARD    1
-#define TEXT_SEARCH_FORWARD     2
+#define GUI_BUFFER_TYPE_STANDARD 0
+#define GUI_BUFFER_TYPE_DCC      1
+#define GUI_BUFFER_TYPE_RAW_DATA 2
+
+#define GUI_SERVER(buffer)  ((t_irc_server *)(buffer->server))
+#define GUI_CHANNEL(buffer) ((t_irc_channel *)(buffer->channel))
+
+#define GUI_BUFFER_IS_SERVER(buffer)    ((GUI_SERVER(buffer) || (buffer->all_servers)) && !GUI_CHANNEL(buffer))
+#define GUI_BUFFER_IS_CHANNEL(buffer)   (GUI_CHANNEL(buffer) && (GUI_CHANNEL(buffer)->type == IRC_CHANNEL_TYPE_CHANNEL))
+#define GUI_BUFFER_IS_PRIVATE(buffer)   (GUI_CHANNEL(buffer) && \
+                                        ((GUI_CHANNEL(buffer)->type == IRC_CHANNEL_TYPE_PRIVATE) \
+                                        || (GUI_CHANNEL(buffer)->type == IRC_CHANNEL_TYPE_DCC_CHAT)))
+
+#define GUI_BUFFER_HAS_NICKLIST(buffer) (GUI_BUFFER_IS_CHANNEL(buffer))
+
+#define GUI_MSG_TYPE_TIME      1
+#define GUI_MSG_TYPE_PREFIX    2
+#define GUI_MSG_TYPE_NICK      4
+#define GUI_MSG_TYPE_INFO      8
+#define GUI_MSG_TYPE_MSG       16
+#define GUI_MSG_TYPE_HIGHLIGHT 32
+#define GUI_MSG_TYPE_NOLOG     64
+
+#define GUI_PREFIX_SERVER    "-@-"
+#define GUI_PREFIX_INFO      "-=-"
+#define GUI_PREFIX_ACTION_ME "-*-"
+#define GUI_PREFIX_JOIN      "-->"
+#define GUI_PREFIX_PART      "<--"
+#define GUI_PREFIX_QUIT      "<--"
+#define GUI_PREFIX_ERROR     "=!="
+#define GUI_PREFIX_PLUGIN    "-P-"
+#define GUI_PREFIX_RECV_MOD  "==>"
+#define GUI_PREFIX_SEND_MOD  "<=="
+
+#define GUI_NOTIFY_LEVEL_MIN     0
+#define GUI_NOTIFY_LEVEL_MAX     3
+#define GUI_NOTIFY_LEVEL_DEFAULT GUI_NOTIFY_LEVEL_MAX
+
+#define GUI_TEXT_SEARCH_DISABLED 0
+#define GUI_TEXT_SEARCH_BACKWARD 1
+#define GUI_TEXT_SEARCH_FORWARD  2
+
+#define GUI_INPUT_BUFFER_BLOCK_SIZE 256
 
 /* buffer structures */
 
diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h
index ba2f73a0a..ef2aa9d3d 100644
--- a/src/gui/gui-color.h
+++ b/src/gui/gui-color.h
@@ -20,77 +20,75 @@
 #ifndef __WEECHAT_GUI_COLOR_H
 #define __WEECHAT_GUI_COLOR_H 1
 
-#define INPUT_BUFFER_BLOCK_SIZE 256
-
-#define COLOR_WIN_NICK_NUMBER 10
+#define GUI_COLOR_WIN_NICK_NUMBER 10
 
 typedef enum t_weechat_color t_weechat_color;
 
 enum t_weechat_color
 {
-    COLOR_WIN_SEPARATOR = 0,
-    COLOR_WIN_TITLE,
-    COLOR_WIN_CHAT,
-    COLOR_WIN_CHAT_TIME,
-    COLOR_WIN_CHAT_TIME_SEP,
-    COLOR_WIN_CHAT_PREFIX1,
-    COLOR_WIN_CHAT_PREFIX2,
-    COLOR_WIN_CHAT_SERVER,
-    COLOR_WIN_CHAT_JOIN,
-    COLOR_WIN_CHAT_PART,
-    COLOR_WIN_CHAT_NICK,
-    COLOR_WIN_CHAT_HOST,
-    COLOR_WIN_CHAT_CHANNEL,
-    COLOR_WIN_CHAT_DARK,
-    COLOR_WIN_CHAT_HIGHLIGHT,
-    COLOR_WIN_CHAT_READ_MARKER,
-    COLOR_WIN_STATUS,
-    COLOR_WIN_STATUS_DELIMITERS,
-    COLOR_WIN_STATUS_CHANNEL,
-    COLOR_WIN_STATUS_DATA_MSG,
-    COLOR_WIN_STATUS_DATA_PRIVATE,
-    COLOR_WIN_STATUS_DATA_HIGHLIGHT,
-    COLOR_WIN_STATUS_DATA_OTHER,
-    COLOR_WIN_STATUS_MORE,
-    COLOR_WIN_INFOBAR,
-    COLOR_WIN_INFOBAR_DELIMITERS,
-    COLOR_WIN_INFOBAR_HIGHLIGHT,
-    COLOR_WIN_INPUT,
-    COLOR_WIN_INPUT_CHANNEL,
-    COLOR_WIN_INPUT_NICK,
-    COLOR_WIN_INPUT_DELIMITERS,
-    COLOR_WIN_NICK,
-    COLOR_WIN_NICK_AWAY,
-    COLOR_WIN_NICK_CHANOWNER,
-    COLOR_WIN_NICK_CHANADMIN,
-    COLOR_WIN_NICK_OP,
-    COLOR_WIN_NICK_HALFOP,
-    COLOR_WIN_NICK_VOICE,
-    COLOR_WIN_NICK_MORE,
-    COLOR_WIN_NICK_SEP,
-    COLOR_WIN_NICK_SELF,
-    COLOR_WIN_NICK_PRIVATE,
-    COLOR_WIN_NICK_1,
-    COLOR_WIN_NICK_2,
-    COLOR_WIN_NICK_3,
-    COLOR_WIN_NICK_4,
-    COLOR_WIN_NICK_5,
-    COLOR_WIN_NICK_6,
-    COLOR_WIN_NICK_7,
-    COLOR_WIN_NICK_8,
-    COLOR_WIN_NICK_9,
-    COLOR_WIN_NICK_10,
-    COLOR_DCC_SELECTED,
-    COLOR_DCC_WAITING,
-    COLOR_DCC_CONNECTING,
-    COLOR_DCC_ACTIVE,
-    COLOR_DCC_DONE,
-    COLOR_DCC_FAILED,
-    COLOR_DCC_ABORTED,
-    COLOR_WIN_INPUT_SERVER,
-    COLOR_WIN_TITLE_MORE,
-    COLOR_WIN_INPUT_TEXT_NOT_FOUND,
-    COLOR_WIN_NICK_CHANUSER,
+    GUI_COLOR_WIN_SEPARATOR = 0,
+    GUI_COLOR_WIN_TITLE,
+    GUI_COLOR_WIN_CHAT,
+    GUI_COLOR_WIN_CHAT_TIME,
+    GUI_COLOR_WIN_CHAT_TIME_SEP,
+    GUI_COLOR_WIN_CHAT_PREFIX1,
+    GUI_COLOR_WIN_CHAT_PREFIX2,
+    GUI_COLOR_WIN_CHAT_SERVER,
+    GUI_COLOR_WIN_CHAT_JOIN,
+    GUI_COLOR_WIN_CHAT_PART,
+    GUI_COLOR_WIN_CHAT_NICK,
+    GUI_COLOR_WIN_CHAT_HOST,
+    GUI_COLOR_WIN_CHAT_CHANNEL,
+    GUI_COLOR_WIN_CHAT_DARK,
+    GUI_COLOR_WIN_CHAT_HIGHLIGHT,
+    GUI_COLOR_WIN_CHAT_READ_MARKER,
+    GUI_COLOR_WIN_STATUS,
+    GUI_COLOR_WIN_STATUS_DELIMITERS,
+    GUI_COLOR_WIN_STATUS_CHANNEL,
+    GUI_COLOR_WIN_STATUS_DATA_MSG,
+    GUI_COLOR_WIN_STATUS_DATA_PRIVATE,
+    GUI_COLOR_WIN_STATUS_DATA_HIGHLIGHT,
+    GUI_COLOR_WIN_STATUS_DATA_OTHER,
+    GUI_COLOR_WIN_STATUS_MORE,
+    GUI_COLOR_WIN_INFOBAR,
+    GUI_COLOR_WIN_INFOBAR_DELIMITERS,
+    GUI_COLOR_WIN_INFOBAR_HIGHLIGHT,
+    GUI_COLOR_WIN_INPUT,
+    GUI_COLOR_WIN_INPUT_CHANNEL,
+    GUI_COLOR_WIN_INPUT_NICK,
+    GUI_COLOR_WIN_INPUT_DELIMITERS,
+    GUI_COLOR_WIN_NICK,
+    GUI_COLOR_WIN_NICK_AWAY,
+    GUI_COLOR_WIN_NICK_CHANOWNER,
+    GUI_COLOR_WIN_NICK_CHANADMIN,
+    GUI_COLOR_WIN_NICK_OP,
+    GUI_COLOR_WIN_NICK_HALFOP,
+    GUI_COLOR_WIN_NICK_VOICE,
+    GUI_COLOR_WIN_NICK_MORE,
+    GUI_COLOR_WIN_NICK_SEP,
+    GUI_COLOR_WIN_NICK_SELF,
+    GUI_COLOR_WIN_NICK_PRIVATE,
+    GUI_COLOR_WIN_NICK_1,
+    GUI_COLOR_WIN_NICK_2,
+    GUI_COLOR_WIN_NICK_3,
+    GUI_COLOR_WIN_NICK_4,
+    GUI_COLOR_WIN_NICK_5,
+    GUI_COLOR_WIN_NICK_6,
+    GUI_COLOR_WIN_NICK_7,
+    GUI_COLOR_WIN_NICK_8,
+    GUI_COLOR_WIN_NICK_9,
+    GUI_COLOR_WIN_NICK_10,
+    GUI_COLOR_DCC_SELECTED,
+    GUI_COLOR_DCC_WAITING,
+    GUI_COLOR_DCC_CONNECTING,
+    GUI_COLOR_DCC_ACTIVE,
+    GUI_COLOR_DCC_DONE,
+    GUI_COLOR_DCC_FAILED,
+    GUI_COLOR_DCC_ABORTED,
+    GUI_COLOR_WIN_INPUT_SERVER,
+    GUI_COLOR_WIN_TITLE_MORE,
+    GUI_COLOR_WIN_INPUT_TEXT_NOT_FOUND,
+    GUI_COLOR_WIN_NICK_CHANUSER,
     GUI_NUM_COLORS
 };
 
diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c
index 369b31b93..4017f3eff 100644
--- a/src/gui/gui-common.c
+++ b/src/gui/gui-common.c
@@ -140,20 +140,20 @@ gui_add_to_line (t_gui_buffer *buffer, int type, time_t date, char *nick, char *
         length = strlen (buffer->last_line->data);
         buffer->last_line->data = (char *) realloc (buffer->last_line->data,
                                                     length + strlen (message) + 1);
-        if (((type & MSG_TYPE_TIME) == 0)
+        if (((type & GUI_MSG_TYPE_TIME) == 0)
              && (buffer->last_line->ofs_after_date < 0))
             buffer->last_line->ofs_after_date = length;
-        if (((type & (MSG_TYPE_TIME | MSG_TYPE_NICK)) == 0)
+        if (((type & (GUI_MSG_TYPE_TIME | GUI_MSG_TYPE_NICK)) == 0)
              && (buffer->last_line->ofs_start_message < 0))
             buffer->last_line->ofs_start_message = length;
         strcat (buffer->last_line->data, message);
     }
     else
     {
-        if (((type & MSG_TYPE_TIME) == 0)
+        if (((type & GUI_MSG_TYPE_TIME) == 0)
             && (buffer->last_line->ofs_after_date < 0))
             buffer->last_line->ofs_after_date = 0;
-        if (((type & (MSG_TYPE_TIME | MSG_TYPE_NICK)) == 0)
+        if (((type & (GUI_MSG_TYPE_TIME | GUI_MSG_TYPE_NICK)) == 0)
             && (buffer->last_line->ofs_start_message < 0))
             buffer->last_line->ofs_start_message = 0;
         buffer->last_line->data = strdup (message);
@@ -161,13 +161,13 @@ gui_add_to_line (t_gui_buffer *buffer, int type, time_t date, char *nick, char *
     
     length = gui_word_strlen (NULL, message);
     buffer->last_line->length += length;
-    if (type & MSG_TYPE_MSG)
+    if (type & GUI_MSG_TYPE_MSG)
         buffer->last_line->line_with_message = 1;
-    if (type & MSG_TYPE_HIGHLIGHT)
+    if (type & GUI_MSG_TYPE_HIGHLIGHT)
         buffer->last_line->line_with_highlight = 1;
-    if ((type & MSG_TYPE_TIME) || (type & MSG_TYPE_NICK) || (type & MSG_TYPE_PREFIX))
+    if ((type & GUI_MSG_TYPE_TIME) || (type & GUI_MSG_TYPE_NICK) || (type & GUI_MSG_TYPE_PREFIX))
         buffer->last_line->length_align += length;
-    if (type & MSG_TYPE_NOLOG)
+    if (type & GUI_MSG_TYPE_NOLOG)
         buffer->last_line->log_write = 0;
     if (pos)
     {
@@ -185,13 +185,13 @@ gui_add_to_line (t_gui_buffer *buffer, int type, time_t date, char *nick, char *
                 buffer->notify_level)
             {
                 if (buffer->last_line->line_with_highlight)
-                    hotlist_add (HOTLIST_HIGHLIGHT, NULL, SERVER(buffer), buffer, 0);
-                else if (BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message))
-                    hotlist_add (HOTLIST_PRIVATE, NULL, SERVER(buffer), buffer, 0);
+                    hotlist_add (HOTLIST_HIGHLIGHT, NULL, GUI_SERVER(buffer), buffer, 0);
+                else if (GUI_BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message))
+                    hotlist_add (HOTLIST_PRIVATE, NULL, GUI_SERVER(buffer), buffer, 0);
                 else if (buffer->last_line->line_with_message)
-                    hotlist_add (HOTLIST_MSG, NULL, SERVER(buffer), buffer, 0);
+                    hotlist_add (HOTLIST_MSG, NULL, GUI_SERVER(buffer), buffer, 0);
                 else
-                    hotlist_add (HOTLIST_LOW, NULL, SERVER(buffer), buffer, 0);
+                    hotlist_add (HOTLIST_LOW, NULL, GUI_SERVER(buffer), buffer, 0);
                 gui_status_draw (gui_current_window->buffer, 1);
             }
         }
@@ -237,13 +237,13 @@ gui_printf_internal (t_gui_buffer *buffer, int display_time, int type,
     {
         if (buffer == NULL)
         {
-            type |= MSG_TYPE_NOLOG;
-            if (SERVER(gui_current_window->buffer))
-                buffer = SERVER(gui_current_window->buffer)->buffer;
+            type |= GUI_MSG_TYPE_NOLOG;
+            if (GUI_SERVER(gui_current_window->buffer))
+                buffer = GUI_SERVER(gui_current_window->buffer)->buffer;
             else
                 buffer = gui_current_window->buffer;
             
-            if (!buffer || (buffer->type != BUFFER_TYPE_STANDARD))
+            if (!buffer || (buffer->type != GUI_BUFFER_TYPE_STANDARD))
                 buffer = gui_buffers;
         }
     
@@ -255,10 +255,10 @@ gui_printf_internal (t_gui_buffer *buffer, int display_time, int type,
             return;
         }
         
-        if (buffer->type == BUFFER_TYPE_DCC)
+        if (buffer->type == GUI_BUFFER_TYPE_DCC)
             buffer = gui_buffers;
         
-        if (buffer->type == BUFFER_TYPE_DCC)
+        if (buffer->type == GUI_BUFFER_TYPE_DCC)
             return;
     }
     
@@ -314,44 +314,44 @@ gui_printf_internal (t_gui_buffer *buffer, int display_time, int type,
                         text_time_char[0] = text_time[i];
                         if (time_first_digit < 0)
                         {
-                            gui_add_to_line (buffer, MSG_TYPE_TIME, date,
-                                             NULL, GUI_COLOR(COLOR_WIN_CHAT_TIME));
-                            gui_add_to_line (buffer, MSG_TYPE_TIME, date,
+                            gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
+                                             NULL, GUI_COLOR(GUI_COLOR_WIN_CHAT_TIME));
+                            gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
                                              NULL, text_time_char);
                         }
                         else
                         {
                             if ((i < time_first_digit) || (i > time_last_digit))
                             {
-                                gui_add_to_line (buffer, MSG_TYPE_TIME, date,
-                                                 NULL, GUI_COLOR(COLOR_WIN_CHAT_DARK));
-                                gui_add_to_line (buffer, MSG_TYPE_TIME, date,
+                                gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
+                                                 NULL, GUI_COLOR(GUI_COLOR_WIN_CHAT_DARK));
+                                gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
                                                  NULL, text_time_char);
                             }
                             else
                             {
                                 if (isdigit (text_time[i]))
                                 {
-                                    gui_add_to_line (buffer, MSG_TYPE_TIME, date,
-                                                     NULL, GUI_COLOR(COLOR_WIN_CHAT_TIME));
-                                    gui_add_to_line (buffer, MSG_TYPE_TIME, date,
+                                    gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
+                                                     NULL, GUI_COLOR(GUI_COLOR_WIN_CHAT_TIME));
+                                    gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
                                                      NULL, text_time_char);
                                 }
                                 else
                                 {
-                                    gui_add_to_line (buffer, MSG_TYPE_TIME, date,
-                                                     NULL, GUI_COLOR(COLOR_WIN_CHAT_TIME_SEP));
-                                    gui_add_to_line (buffer, MSG_TYPE_TIME, date,
+                                    gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
+                                                     NULL, GUI_COLOR(GUI_COLOR_WIN_CHAT_TIME_SEP));
+                                    gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
                                                      NULL, text_time_char);
                                 }
                             }
                         }
                         i++;
                     }
-                    gui_add_to_line (buffer, MSG_TYPE_TIME, date,
-                                     NULL, GUI_COLOR(COLOR_WIN_CHAT));
+                    gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date,
+                                     NULL, GUI_COLOR(GUI_COLOR_WIN_CHAT));
                 }
-                gui_add_to_line (buffer, MSG_TYPE_TIME, date, NULL, " ");
+                gui_add_to_line (buffer, GUI_MSG_TYPE_TIME, date, NULL, " ");
             }
             gui_add_to_line (buffer, type, date, nick, pos);
             pos = strchr (pos, '\n');
@@ -390,14 +390,14 @@ gui_printf_raw_data (void *server, int send, int modified, char *message)
                 pos[0] = '\0';
             gui_printf_nolog (gui_buffer_raw_data,
                               "%s[%s%s%s] %s%s%s %s\n",
-                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
-                              GUI_COLOR(COLOR_WIN_CHAT_SERVER),
+                              GUI_COLOR(GUI_COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR(GUI_COLOR_WIN_CHAT_SERVER),
                               ((t_irc_server *)server)->name,
-                              GUI_COLOR(COLOR_WIN_CHAT_DARK),
-                              GUI_COLOR((send) ? COLOR_WIN_CHAT_PART : COLOR_WIN_CHAT_JOIN),
-                              (send) ? ((modified) ? PREFIX_SEND_MOD : PREFIX_PART) :
-                              ((modified) ? PREFIX_RECV_MOD : PREFIX_JOIN),
-                              GUI_COLOR(COLOR_WIN_CHAT),
+                              GUI_COLOR(GUI_COLOR_WIN_CHAT_DARK),
+                              GUI_COLOR((send) ? GUI_COLOR_WIN_CHAT_PART : GUI_COLOR_WIN_CHAT_JOIN),
+                              (send) ? ((modified) ? GUI_PREFIX_SEND_MOD : GUI_PREFIX_PART) :
+                              ((modified) ? GUI_PREFIX_RECV_MOD : GUI_PREFIX_JOIN),
+                              GUI_COLOR(GUI_COLOR_WIN_CHAT),
                               message);
             if (pos)
             {
@@ -493,8 +493,8 @@ gui_input_optimize_size (t_gui_buffer *buffer)
     
     if (buffer->has_input)
     {
-        optimal_size = ((buffer->input_buffer_size / INPUT_BUFFER_BLOCK_SIZE) *
-                        INPUT_BUFFER_BLOCK_SIZE) + INPUT_BUFFER_BLOCK_SIZE;
+        optimal_size = ((buffer->input_buffer_size / GUI_INPUT_BUFFER_BLOCK_SIZE) *
+                        GUI_INPUT_BUFFER_BLOCK_SIZE) + GUI_INPUT_BUFFER_BLOCK_SIZE;
         if (buffer->input_buffer_alloc != optimal_size)
         {
             buffer->input_buffer_alloc = optimal_size;
@@ -672,7 +672,7 @@ gui_exec_action_dcc (t_gui_window *window, char *actions)
         if (actions[0] >= 32)
         {
             dcc_selected = (window->dcc_selected) ?
-                (t_irc_dcc *) window->dcc_selected : dcc_list;
+                (t_irc_dcc *) window->dcc_selected : irc_dcc_list;
             
             switch (actions[0])
             {
@@ -680,8 +680,8 @@ gui_exec_action_dcc (t_gui_window *window, char *actions)
                 case 'a':
                 case 'A':
                     if (dcc_selected
-                        && (DCC_IS_RECV(dcc_selected->status))
-                        && (dcc_selected->status == DCC_WAITING))
+                        && (IRC_DCC_IS_RECV(dcc_selected->status))
+                        && (dcc_selected->status == IRC_DCC_WAITING))
                     {
                         irc_dcc_accept (dcc_selected);
                     }
@@ -690,9 +690,9 @@ gui_exec_action_dcc (t_gui_window *window, char *actions)
                 case 'c':
                 case 'C':
                     if (dcc_selected
-                        && (!DCC_ENDED(dcc_selected->status)))
+                        && (!IRC_DCC_ENDED(dcc_selected->status)))
                     {
-                        irc_dcc_close (dcc_selected, DCC_ABORTED);
+                        irc_dcc_close (dcc_selected, IRC_DCC_ABORTED);
                         gui_window_redraw_buffer (window->buffer);
                     }
                     break;
@@ -702,11 +702,11 @@ gui_exec_action_dcc (t_gui_window *window, char *actions)
                     window->dcc_first = NULL;
                     window->dcc_selected = NULL;
                     window->dcc_last_displayed = NULL;
-                    ptr_dcc = dcc_list;
+                    ptr_dcc = irc_dcc_list;
                     while (ptr_dcc)
                     {
                         ptr_dcc_next = ptr_dcc->next_dcc;
-                        if (DCC_ENDED(ptr_dcc->status))
+                        if (IRC_DCC_ENDED(ptr_dcc->status))
                             irc_dcc_free (ptr_dcc);
                         ptr_dcc = ptr_dcc_next;
                     }
@@ -736,7 +736,7 @@ gui_exec_action_dcc (t_gui_window *window, char *actions)
                 case 'r':
                 case 'R':
                     if (dcc_selected
-                        && (DCC_ENDED(dcc_selected->status)))
+                        && (IRC_DCC_ENDED(dcc_selected->status)))
                     {
                         if (dcc_selected->next_dcc)
                             window->dcc_selected = dcc_selected->next_dcc;
diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c
index c4d3f0991..3c8749748 100644
--- a/src/gui/gui-keyboard.c
+++ b/src/gui/gui-keyboard.c
@@ -592,8 +592,8 @@ gui_keyboard_pressed (char *key_str)
                 {
                     for (ptr_cmd = commands; *ptr_cmd; ptr_cmd++)
                     {
-                        user_command (SERVER(gui_current_window->buffer),
-                                      CHANNEL(gui_current_window->buffer),
+                        user_command (GUI_SERVER(gui_current_window->buffer),
+                                      GUI_CHANNEL(gui_current_window->buffer),
                                       *ptr_cmd, 0);
                     }
                     free_multi_command (commands);
@@ -602,7 +602,7 @@ gui_keyboard_pressed (char *key_str)
             else
                 (void)(ptr_key->function)(gui_current_window, ptr_key->args);
 #ifdef PLUGINS
-            if (gui_current_window->buffer->text_search == TEXT_SEARCH_DISABLED)
+            if (gui_current_window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)
             {
                 (void) plugin_keyboard_handler_exec (
                     (ptr_key->command) ?
diff --git a/src/gui/gui-keyboard.h b/src/gui/gui-keyboard.h
index 9d9b62bb6..5f6c94dd6 100644
--- a/src/gui/gui-keyboard.h
+++ b/src/gui/gui-keyboard.h
@@ -20,9 +20,6 @@
 #ifndef __WEECHAT_GUI_KEY_H
 #define __WEECHAT_GUI_KEY_H 1
 
-#define KEY_SHOW_MODE_DISPLAY   1
-#define KEY_SHOW_MODE_BIND      2
-
 /* key structures */
 
 typedef void (t_gui_key_func)(t_gui_window *, char *);
diff --git a/src/gui/gui-log.c b/src/gui/gui-log.c
index 515a9c5e0..d8a51c202 100644
--- a/src/gui/gui-log.c
+++ b/src/gui/gui-log.c
@@ -112,21 +112,21 @@ gui_log_start (t_gui_buffer *buffer)
     log_path = weechat_strreplace (cfg_log_path, "~", getenv ("HOME"));
     log_path2 = weechat_strreplace (log_path, "%h", weechat_home);
     
-    if (SERVER(buffer))
-        server_name = weechat_strreplace (SERVER(buffer)->name, DIR_SEPARATOR, "_");
+    if (GUI_SERVER(buffer))
+        server_name = weechat_strreplace (GUI_SERVER(buffer)->name, DIR_SEPARATOR, "_");
     else
         server_name = NULL;
-    if (CHANNEL(buffer))
-        channel_name = weechat_strreplace (CHANNEL(buffer)->name, DIR_SEPARATOR, "_");
+    if (GUI_CHANNEL(buffer))
+        channel_name = weechat_strreplace (GUI_CHANNEL(buffer)->name, DIR_SEPARATOR, "_");
     else
         channel_name = NULL;
     
-    if (!log_path || !log_path2 || (SERVER(buffer) && !server_name) ||
-        (CHANNEL(buffer) && !channel_name))
+    if (!log_path || !log_path2 || (GUI_SERVER(buffer) && !server_name) ||
+        (GUI_CHANNEL(buffer) && !channel_name))
     {
         weechat_log_printf (_("Not enough memory to write log file \"%s\"\n"),
                             (log_path2) ? log_path2 : ((log_path) ? log_path : cfg_log_path));
-        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
         gui_printf_nolog (NULL, _("Not enough memory to write log file \"%s\"\n"),
                           (log_path2) ? log_path2 : ((log_path) ? log_path : cfg_log_path));
         if (log_path)
@@ -141,9 +141,9 @@ gui_log_start (t_gui_buffer *buffer)
     }
     
     length = strlen (log_path2) + 128;
-    if (SERVER(buffer))
+    if (GUI_SERVER(buffer))
         length += strlen (server_name);
-    if (CHANNEL(buffer))
+    if (GUI_CHANNEL(buffer))
         length += strlen (channel_name);
     
     buffer->log_filename = (char *) malloc (length);
@@ -151,7 +151,7 @@ gui_log_start (t_gui_buffer *buffer)
     {
         weechat_log_printf (_("Not enough memory to write log file \"%s\"\n"),
                             (log_path2) ? log_path2 : ((log_path) ? log_path : cfg_log_path));
-        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
         gui_printf_nolog (NULL, _("Not enough memory to write log file \"%s\"\n"),
                           (log_path2) ? log_path2 : ((log_path) ? log_path : cfg_log_path));
         free (log_path);
@@ -171,17 +171,17 @@ gui_log_start (t_gui_buffer *buffer)
     if (buffer->log_filename[strlen (buffer->log_filename) - 1] != DIR_SEPARATOR_CHAR)
         strcat (buffer->log_filename, DIR_SEPARATOR);
     
-    if (SERVER(buffer))
+    if (GUI_SERVER(buffer))
     {
         strcat (buffer->log_filename, server_name);
         strcat (buffer->log_filename, ".");
     }
-    if (CHANNEL(buffer)
-        && (CHANNEL(buffer)->type == CHANNEL_TYPE_DCC_CHAT))
+    if (GUI_CHANNEL(buffer)
+        && (GUI_CHANNEL(buffer)->type == IRC_CHANNEL_TYPE_DCC_CHAT))
     {
         strcat (buffer->log_filename, "dcc.");
     }
-    if (CHANNEL(buffer))
+    if (GUI_CHANNEL(buffer))
     {
         strcat (buffer->log_filename, channel_name);
         strcat (buffer->log_filename, ".");
@@ -198,7 +198,7 @@ gui_log_start (t_gui_buffer *buffer)
     {
         weechat_log_printf (_("Unable to write log file \"%s\"\n"),
                             buffer->log_filename);
-        irc_display_prefix (NULL, NULL, PREFIX_ERROR);
+        irc_display_prefix (NULL, NULL, GUI_PREFIX_ERROR);
         gui_printf (NULL, _("Unable to write log file \"%s\"\n"),
                     buffer->log_filename);
         free (buffer->log_filename);
diff --git a/src/gui/gui-window.c b/src/gui/gui-window.c
index b851f7313..f99255e64 100644
--- a/src/gui/gui-window.c
+++ b/src/gui/gui-window.c
@@ -315,9 +315,10 @@ gui_window_switch_server (t_gui_window *window)
     
     if (ptr_buffer)
     {
-        ptr_server = (SERVER(ptr_buffer) && SERVER(ptr_buffer)->next_server) ?
-            SERVER(ptr_buffer)->next_server : irc_servers;
-        while (ptr_server != SERVER(window->buffer))
+        ptr_server = (GUI_SERVER(ptr_buffer)
+                      && GUI_SERVER(ptr_buffer)->next_server) ?
+            GUI_SERVER(ptr_buffer)->next_server : irc_servers;
+        while (ptr_server != GUI_SERVER(window->buffer))
         {
             if (ptr_server->buffer)
                 break;
@@ -325,7 +326,7 @@ gui_window_switch_server (t_gui_window *window)
                 ptr_server = ptr_server->next_server;
             else
             {
-                if (SERVER(ptr_buffer) == NULL)
+                if (GUI_SERVER(ptr_buffer) == NULL)
                 {
                     ptr_server = NULL;
                     break;
@@ -333,7 +334,7 @@ gui_window_switch_server (t_gui_window *window)
                 ptr_server = irc_servers;
             }
         }
-        if (ptr_server && (ptr_server != SERVER(ptr_buffer)))
+        if (ptr_server && (ptr_server != GUI_SERVER(ptr_buffer)))
         {
             ptr_buffer->server = ptr_server;
             gui_status_draw (window->buffer, 1);
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 159eb501b..1382a4aba 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -28,10 +28,10 @@
 
 
 #define gui_printf(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, -1, NULL, fmt, ##argz)
+    gui_printf_internal(buffer, 1, GUI_MSG_TYPE_INFO, -1, NULL, fmt, ##argz)
 
 #define gui_printf_keep_colors(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO, 1, NULL, fmt, ##argz)
+    gui_printf_internal(buffer, 1, GUI_MSG_TYPE_INFO, 1, NULL, fmt, ##argz)
 
 #define gui_printf_type(buffer, type, fmt, argz...) \
     gui_printf_internal(buffer, 1, type, -1, NULL, fmt, ##argz)
@@ -40,10 +40,10 @@
     gui_printf_internal(buffer, 1, type, -1, nick, fmt, ##argz)
 
 #define gui_printf_nolog(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 1, MSG_TYPE_INFO | MSG_TYPE_NOLOG, -1, NULL, fmt, ##argz)
+    gui_printf_internal(buffer, 1, GUI_MSG_TYPE_INFO | GUI_MSG_TYPE_NOLOG, -1, NULL, fmt, ##argz)
 
 #define gui_printf_nolog_notime(buffer, fmt, argz...) \
-    gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, -1, NULL, fmt, ##argz)
+    gui_printf_internal(buffer, 0, GUI_MSG_TYPE_NOLOG, -1, NULL, fmt, ##argz)
 
 
 typedef struct t_gui_infobar t_gui_infobar;