diff --git a/glances.conf b/glances.conf
index 3b163d0..d97c579 100644
--- a/glances.conf
+++ b/glances.conf
@@ -1,8 +1,21 @@
+[quicklook]
+cpu_careful=50
+cpu_warning=70
+cpu_critical=90
+mem_careful=50
+mem_warning=70
+mem_critical=90
+swap_careful=50
+swap_warning=70
+swap_critical=90
+
 [cpu]
 # Default values if not defined: 50/70/90
 user_careful=50
 user_warning=70
 user_critical=90
+#user_log=False
+#user_critical_action=echo {{user}} {{value}} {{max}} > /tmp/cpu.alert
 iowait_careful=50
 iowait_warning=70
 iowait_critical=90
@@ -12,6 +25,7 @@ system_critical=90
 steal_careful=50
 steal_warning=70
 steal_critical=90
+#steal_log=True
 
 [percpu]
 # Default values if not defined: 50/70/90
@@ -33,6 +47,7 @@ system_critical=90
 careful=0.7
 warning=1.0
 critical=5.0
+#log=False
 
 [mem]
 # Default limits for free RAM memory in %
@@ -55,26 +70,40 @@ hide=lo,wlan0
 eth0_rx_careful=400000000
 eth0_rx_warning=600000000
 eth0_rx_critical=800000000
+#eth0_rx_log=True
 eth0_tx_careful=400000000
 eth0_tx_warning=600000000
 eth0_tx_critical=800000000
+#eth0_tx_log=True
+# WLAN 0 alias
+#wlan0_alias=Wireless IF
 #wlan0_rx_careful=4000000
 #wlan0_rx_warning=5000000
 #wlan0_rx_critical=6000000
+#wlan0_rx_log=True
 #wlan0_tx_careful=700000
 #wlan0_tx_warning=900000
 #wlan0_tx_critical=1000000
+#wlan0_tx_log=True
 
-#[diskio]
+[diskio]
 # Define the list of hidden disks (comma separeted)
 #hide=sda2,sda5
+# Alias for sda1
+sda1_alias=/boot
+sda2_alias=/
+sda3_alias=SWAP
 
 [fs]
 # Default limits for free filesytem space in %
 # Default values if not defined: 50/70/90
+# It is also possible to define per mount point value
+# Example: /_careful=40
 careful=60
 warning=80
 critical=90
+# Allow additionnals files types (comma-separated FS type)
+#allow=zfs
 
 [sensors]
 # Sensors core limits
@@ -91,6 +120,11 @@ temperature_hdd_critical=55
 battery_careful=80
 battery_warning=90
 battery_critical=95
+# Sensors alias
+#temp1_alias=Motherboard 0
+#temp2_alias=Motherboard 1
+#core 0_alias=CPU Core 0
+#core 1_alias=CPU Core 1
 
 [processlist]
 # Limit values for CPU/MEM per process in %
@@ -127,31 +161,60 @@ mem_critical=90
 #list_2_description=Famous Xeyes
 #list_2_regex=.*xeyes.*
 #list_2_countmin=1
-list_1_description=SabNZBd+
-list_1_regex=.*sabnzbd.*
+list_1_description=Apache2
+list_1_regex=.*apache2.*
 list_1_countmin=1
-list_2_description=NewzNab
-list_2_regex=.*newznab.*
+list_2_description=MariaDB
+list_2_regex=.*mysqld.*
 list_2_countmin=1
-list_3_description=Flightradar24
-list_3_regex=.*flightradar24.*
+list_3_description=OpenFire
+list_3_regex=.*openfire.*
 list_3_countmin=1
-list_4_description=MariaDB
-list_4_regex=.*mysqld.*
+list_4_description=Flightradar24
+list_4_regex=.*fr24feed.*
 list_4_countmin=1
 list_5_description=SubSonic
 list_5_regex=.*subsonic.*
 list_5_countmin=1
-list_6_description=OpenFire
-list_6_regex=.*openfire.*
+list_6_description=SabNZBd+
+list_6_regex=.*sabnzbd.*
 list_6_countmin=1
-list_7_description=MediaTomb
-list_7_regex=.*mediatomb.*
+list_7_description=NewzNab
+list_7_regex=.*newznab.*
 list_7_countmin=1
-list_8_description=Apache2
-list_8_regex=.*apache2.*
-list_8_countmin=1
 #list_10_description=NFSd
 #list_10_regex=.*nfs.*
 #list_10_countmin=1
 
+#[serverlist]
+# Define the static server list
+#server_1_name=localhost
+#server_1_alias=My local PC
+#server_1_port=61209
+#server_2_name=localhost
+#server_2_port=61235
+#server_3_name=192.168.0.17
+#server_3_alias=Another PC on my network
+#server_3_port=61209
+#server_4_name=pasbon
+#server_4_port=61237
+
+[influxdb]
+host=localhost
+port=8086
+user=root
+password=root
+db=glances
+#prefix=localhost
+
+[statsd]
+host=localhost
+port=8125
+#prefix=glances
+
+[rabbitmq]
+host=localhost
+port=5672
+user=guest
+password=guest
+queue=glances_queue