diff --git a/weechat/alias.conf b/weechat/alias.conf
index 77d65c1..f070b55 100644
--- a/weechat/alias.conf
+++ b/weechat/alias.conf
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v1.1.1
+# weechat -- alias.conf
 #
 
 [cmd]
diff --git a/weechat/aspell.conf b/weechat/aspell.conf
index 9b9d5f9..4dcc4da 100644
--- a/weechat/aspell.conf
+++ b/weechat/aspell.conf
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v1.1.1
+# weechat -- aspell.conf
 #
 
 [color]
diff --git a/weechat/charset.conf b/weechat/charset.conf
index c319dd3..99a90d5 100644
--- a/weechat/charset.conf
+++ b/weechat/charset.conf
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v1.1.1
+# weechat -- charset.conf
 #
 
 [default]
diff --git a/weechat/colorize_nicks.conf b/weechat/colorize_nicks.conf
index c8e4038..d0483de 100644
--- a/weechat/colorize_nicks.conf
+++ b/weechat/colorize_nicks.conf
@@ -1,5 +1,5 @@
 #
-# colorize_nicks.conf -- weechat v1.1.1
+# weechat -- colorize_nicks.conf
 #
 
 [look]
diff --git a/weechat/exec.conf b/weechat/exec.conf
index f7f6212..39f1929 100644
--- a/weechat/exec.conf
+++ b/weechat/exec.conf
@@ -1,5 +1,5 @@
 #
-# exec.conf -- weechat v1.1.1
+# weechat -- exec.conf
 #
 
 [command]
diff --git a/weechat/logger.conf b/weechat/logger.conf
index 03c06dc..89fed53 100644
--- a/weechat/logger.conf
+++ b/weechat/logger.conf
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v1.1.1
+# weechat -- logger.conf
 #
 
 [look]
diff --git a/weechat/plugins.conf b/weechat/plugins.conf
index c09f86a..7fe994e 100644
--- a/weechat/plugins.conf
+++ b/weechat/plugins.conf
@@ -1,5 +1,5 @@
 #
-# plugins.conf -- weechat v1.1.1
+# weechat -- plugins.conf
 #
 
 [var]
diff --git a/weechat/relay.conf b/weechat/relay.conf
index f5de350..e6de21c 100644
--- a/weechat/relay.conf
+++ b/weechat/relay.conf
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v1.1.1
+# weechat -- relay.conf
 #
 
 [look]
diff --git a/weechat/script.conf b/weechat/script.conf
index 196b5d5..92c709d 100644
--- a/weechat/script.conf
+++ b/weechat/script.conf
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v1.1.1
+# weechat -- script.conf
 #
 
 [look]
diff --git a/weechat/sec.conf b/weechat/sec.conf
index 53c1e2f..3672aa7 100644
--- a/weechat/sec.conf
+++ b/weechat/sec.conf
@@ -1,5 +1,5 @@
 #
-# sec.conf -- weechat v1.1.1
+# weechat -- sec.conf
 #
 
 [crypt]
diff --git a/weechat/trigger.conf b/weechat/trigger.conf
index 2f638e3..6d0c6d0 100644
--- a/weechat/trigger.conf
+++ b/weechat/trigger.conf
@@ -1,5 +1,5 @@
 #
-# trigger.conf -- weechat v1.1.1
+# weechat -- trigger.conf
 #
 
 [look]
diff --git a/weechat/weechat.conf b/weechat/weechat.conf
index e4597db..8f6247d 100644
--- a/weechat/weechat.conf
+++ b/weechat/weechat.conf
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v1.1.1
+# weechat -- weechat.conf
 #
 
 [debug]
@@ -97,6 +97,9 @@ prefix_network = "--"
 prefix_quit = "<--"
 prefix_same_nick = ""
 prefix_suffix = ""
+quote_nick_prefix = "<"
+quote_nick_suffix = ">"
+quote_time_format = "%H:%M:%S"
 read_marker = line
 read_marker_always_show = off
 read_marker_string = "- "
@@ -114,6 +117,8 @@ window_auto_zoom = off
 window_separator_horizontal = on
 window_separator_vertical = on
 window_title = "WeeChat ${info:version}"
+word_chars_highlight = "!\u00A0,-,_,|,alnum"
+word_chars_input = "!\u00A0,-,_,|,alnum"
 
 [palette]
 
@@ -253,7 +258,7 @@ nicklist.color_fg = default
 nicklist.conditions = "${nicklist}"
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = off
+nicklist.hidden = on
 nicklist.items = "buffer_nicklist"
 nicklist.position = right
 nicklist.priority = 200
diff --git a/weechat/xfer.conf b/weechat/xfer.conf
index 43d1444..39ac5bd 100644
--- a/weechat/xfer.conf
+++ b/weechat/xfer.conf
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v1.1.1
+# weechat -- xfer.conf
 #
 
 [look]