diff --git a/conkyrc b/conkyrc
index 6334786..3b641a7 100644
--- a/conkyrc
+++ b/conkyrc
@@ -48,21 +48,26 @@ ${color2}lgin ${color1}:${color0} ${uptime}
 #${color2}os   ${color1}:${color0} ${sysname} ${kernel}
 ${color0}${stippled_hr}
 ${color2}freq ${color1}:${color0} ${freq 1}Mhz | ${freq 2}Mhz
-${color2}cpu  ${color1}:${color0} ${cpu cpu0}% ${cpubar cpu0}
+${color2}cpu  ${color1}:${color0} ${cpu}% ${cpubar}
 #${color2}btry ${color1}:${color0} ${battery}
 #${color2}btime${color1}:${color0} ${battery_time}
 ${color0}${hr}
 ${color2}ram  ${color1}:${color0} ${memperc}% ${membar}
-${color2}swap ${color1}:${color0} None
+${color2}swap ${color1}:${color0} ${if_match ${swapmax} == 0}None${else}${swapperc} ${swapbar}${endif}
 ${color0}${stippled_hr}
-${color2}root ${color1}:${color0} ${fs_free /} ${fs_bar /}
-${color2}/tmp ${color1}:${color0} ${fs_free /tmp} ${fs_bar /tmp}
+${color2}root ${color1}:${color0} ${fs_used /} #/${fs_size /}
+${fs_bar /}
+${color2}/tmp ${color1}:${color0} ${fs_used /tmp} #/${fs_size /tmp}
+${fs_bar /tmp}
+${color2}dio  ${color1}:${color0} ${diskio}
 ${color0}${hr}
-${color2}addr ${color1}:${color0} ${addr}
+${color2}${gw_iface} ${color1}:${color0} ${addr}
+${color2}ssid ${color1}:${color0} ${wireless_essid}
 ${color0}${stippled_hr}
-${color2}down ${color1}:${color0} ${downspeed eth0}/s
-${color #888888}${downspeedgraph eth0 ff0000 0000ff}
-${color2}up   ${color1}:${color0} ${upspeed eth0}/s
-${color #888888}${upspeedgraph eth0 0000ff ff0000}
+${color2}down ${color1}:${color0} ${downspeed}/s
+${color #888888}${downspeedgraph ff0000 0000ff}
+${color2}up   ${color1}:${color0} ${upspeed}/s
+${color #888888}${upspeedgraph 0000ff ff0000}
 ${color0}${hr}
+${alignr}conky ${conky_version} on ${desktop_name}
 #${color0}${alignr}${execi 900 cal -1}
diff --git a/conkyrc.2 b/conkyrc.2
index f88b945..ad04bef 100644
--- a/conkyrc.2
+++ b/conkyrc.2
@@ -35,7 +35,6 @@ uppercase no
 format_human_readable yes
 
 TEXT
-
-${color yellow}$$ tail -f /var/log/everything.log
-${color white}${tail /var/log/everything.log 15}
+${color yellow}$$ tail -f -n 12 /var/log/everything.log
+${color white}${tail /var/log/everything.log 12}
 ${time %b %d %T}