diff --git a/configs/conky_cpu b/configs/conky_cpu
index 0e344c7..e8061c1 100644
--- a/configs/conky_cpu
+++ b/configs/conky_cpu
@@ -32,20 +32,24 @@ conky.config = {
 
 	font = 'Monofur:bold:size=8',
 
--- ------------------------- Color
+-- ------------------------- Colors
 	default_color = 'DCDCDC',
 	color0 = '3399FF',
 	color1 = 'CCCCCC',
 	color2 = 'AAAAAA',
 	color3 = '888888',
+	color4 = '555555',
+	color5 = '00008b',
 
--- ------------------------- OTHER
+-- ------------------------- Other
 	update_interval = 1,
 
 	top_cpu_separate = false,
 	cpu_avg_samples = 2,
 
-	template0 = [[${GOTO 50}${color\1}${font Monofur:bold:size=6}${top name \2}${alignr}${top cpu \2}%]],
+	template0 = [[${GOTO 50}${color\1}${top name \2}${GOTO 135}${font Monofur:bold:size=7}${top pid \2}${alignr}${top cpu \2}%]],
+
+	no_buffers = true,
 };
 
 conky.text = [[
@@ -54,9 +58,11 @@ ${voffset 10}${GOTO 50}${font}Avg use: ${font Monofur:size=8}${color0}${cpu cpu0
 ${color}${font Monofur:bold:size=8}${GOTO 50}Core:${GOTO 90}1${offset 6}${color0}${font Monofur:size=6}${voffset -1}${cpu cpu0}%${voffset -1}${color}${font}${GOTO 127}2${offset 6}${color0}${font Monofur:size=6}${voffset -1}${cpu cpu1}%
 ${GOTO 50}${cpugraph cpu0 15,185 00008b 3399FF}
 ${GOTO 50}${cpugraph cpu1 15,185 00008b 3399FF}
-${template0 0 1}
-${template0 1 2}
-${template0 2 3}
+${voffset 3}${font Monofur:size=7}${template0 0 1}
+${template0 2 2}
+${template0 3 3}
 ${template0 3 4}
-${image ~/.conky/conky-xanimos/img/cpu.png -p 0,5}
+${template0 3 5}
+${template0 3 6}
+${image ~/.conky/conky-xanimos/img/cpu.png -p 0,0}
 ]];
diff --git a/configs/conky_files b/configs/conky_files
index 138dbc2..be21dac 100644
--- a/configs/conky_files
+++ b/configs/conky_files
@@ -16,7 +16,7 @@ conky.config = {
 	minimum_width = 260,
 	minimum_height = 165,
 	maximum_width = 255,
-	gap_x = 890,
+	gap_x = 670,
 	gap_y = 50,
 
 -- ------------------------- Font
@@ -44,7 +44,7 @@ conky.config = {
 	lua_load = '~/.conky/conky-xanimos/lua/files_ring.lua',
 	lua_draw_hook_pre = 'main',
 
-	template0 = [[${GOTO 45}${color\1}${top_io name \2} ${GOTO 180}${top_io cpu \2} ${alignr}${top_io io_perc \2}]],
+	template0 = [[${GOTO 45}${color\1}${top_io name \2} ${GOTO 180}${font Monofur:size=7}${top_io pid \2} ${alignr}${font Monofur:size=7}${top_io io_perc \2}]],
 };
 
 conky.text = [[
@@ -54,7 +54,7 @@ ${voffset 3}${template0 0 1}
 ${template0 1 2}
 ${template0 2 3}
 ${template0 3 4}
-${voffset 3}${GOTO 110}${font Monofur:size=7}${color}/: ${color0}${font Monofur:size=7}${fs_used /}${color} | ${font Monofur:size=7}${color0}${fs_size /}
+${voffset 5}${GOTO 110}${font Monofur:size=7}${color}/: ${color0}${font Monofur:size=7}${fs_used /}${color} | ${font Monofur:size=7}${color0}${fs_size /}
 ${voffset 4}${GOTO 97}${font Monofur:size=7}${color}/home: ${color0}${font Monofur:size=7}${fs_used /home}${color} | ${font Monofur:size=7}${color0}${fs_size /home}
 ${voffset 4}${GOTO 98}${font Monofur:size=7}${color}/tmp: ${color0}${font Monofur:size=7}${fs_used /tmp}${color} | ${font Monofur:size=7}${color0}${fs_size /tmp}
 ${image ~/.conky/conky-xanimos/img/files.png -p 0,5}
diff --git a/configs/conky_network b/configs/conky_network
index 7412968..b84877c 100644
--- a/configs/conky_network
+++ b/configs/conky_network
@@ -16,7 +16,7 @@ conky.config = {
 	minimum_height = 165,
 	maximum_width = 210,
 	gap_x = 0,
-	gap_y = 50,
+	gap_y = 350,
 
 -- ------------------------- Font
 	use_xft = true,
@@ -46,15 +46,16 @@ ${GOTO 50}${font}Public: ${color0}${font Monofur:size=8}${GOTO 100}${texeci 3600
 ${voffset 5}${GOTO 50}${font}Local:  ${color0}${font Monofur:size=8}${GOTO 100}${addrs eth0}${color}
 ${voffset 5}${GOTO 20}${upspeedgraph eth0 15,170 00008b 3399FF}
 ${voffset 5}${GOTO 20}${downspeedgraph eth0 15,170 00008b 3399FF}
+
 ${voffset 10}${GOTO 28}${font Monofur:size=7}Receive: ${font Monofur:size=7}${color0}${downspeed eth0}${GOTO 125}${font Monofur:size=7}${color}Send: ${font Monofur:size=7}${color0}${upspeed eth0}
-${image ~/.conky/conky-xanimos/img/networkhigh.png -p 0,5}${else}${if_existing /proc/net/route wlan0}${voffset 8}${GOTO 50}${font Monofur:bold:size=18}Network${font}
+${image ~/.conky/conky-xanimos/img/networkhigh.png -p 0,5}${else}${if_existing /proc/net/route eth0}${voffset 8}${GOTO 50}${font Monofur:bold:size=18}Network${font}
 ${GOTO 50}${font}Public: ${color0}${font Monofur:size=8}${texeci 36000 wget -qO - http://ipecho.net/plain | tail}${color}
-${voffset 5}${GOTO 50}${font}Local:  ${color0}${font Monofur:size=8}${addrs wlan0}${color}
-${voffset 5}${GOTO 50}${font}Up: ${font Monofur:size=8}${color0}${upspeed wlan0}
+${voffset 5}${GOTO 50}${font}Local:  ${color0}${font Monofur:size=8}${addrs eth0}${color}
+${voffset 5}${GOTO 50}${font}Up: ${font Monofur:size=8}${color0}${upspeed eth0}
 ${voffset 0}${GOTO 50}${upspeedgraph eth0 15,150 3399FF 3399FF 5000}
-${voffset 2}${GOTO 50}${font}${color}Down: ${font Monofur:size=8}${color0}${downspeed wlan}
-${voffset 0}${GOTO 50}${downspeedgraph wlan0 15,150 3399FF 3399FF 10000}
-${if_match "${wireless_link_qual_perc wlan0}"<"33"}${image ~/.conky/conky-xanimos/img/networklow.png -p 0,5 -s 45x45}${else}${if_match "${wireless_link_qual_perc wlan0}"<"66"}${image ~/.conky/conky-xanimos/img/networkmid.png -p 0,5}${else}${image ~/.conky/conky-xanimos/img/networkhigh.png -p 0,5}${endif}${endif}${else}${voffset 27}${GOTO 50}${font}Network
+${voffset 2}${GOTO 50}${font}${color}eth0: ${font Monofur:size=8}${color0}${downspeed eth0}
+${voffset 0}${GOTO 50}${downspeedgraph eth0 15,150 3399FF 3399FF 10000}
+${if_match "${wireless_link_qual_perc eth0}"<"33"}${image ~/.conky/conky-xanimos/img/networkwired.png -p 0,0 -s 45x45}${else}${if_match "${wireless_link_qual_perc eth0}"<"66"}${image ~/.conky/conky-xanimos/img/networkmid.png -p 01,0}${else}${image ~/.conky/conky-xanimos/img/networkhigh.png -p 0,0}${endif}${endif}${else}${voffset 27}${GOTO 50}${font}Network
 ${GOTO 50}${font}No connection
-${image ~/.conky/conky-xanimos/img/nonetwork.png -p 0,5}${endif}${endif}
+${image ~/.conky/conky-xanimos/img/networkwiredoff.png -p 0,0}${endif}${endif}
 ]];
diff --git a/configs/conky_ram b/configs/conky_ram
index a157a42..c6a5ceb 100644
--- a/configs/conky_ram
+++ b/configs/conky_ram
@@ -38,19 +38,25 @@ conky.config = {
 	color1 = 'CCCCCC',
 	color2 = 'AAAAAA',
 	color3 = '888888',
+	color4 = '555555',
+	color5 = '00008b',
 
 -- ------------------------- Other
 	update_interval = 5,
 
-	template0 = [[${GOTO 50}${color\1}${top_mem name \2}${alignr}${top_mem mem \2}%]],
+
+	template0 = [[${GOTO 50}${color\1}${top_mem name \2}${GOTO 135}${font Monofur:size=7}${top_mem pid \2}${alignr}${font Monofur:size=7}${top_mem mem \2}%]],
 
 	no_buffers = true,
 };
 
 conky.text = [[
 ${voffset 8}${GOTO 50}${font Monofur:bold:size=12}RAM${font}
-${voffset 10}${GOTO 50}${font}Usage: ${font Monofur:size=8}${COLOR0}${memperc}%${alignr}${font Monofur:size=8}${mem}
-${voffset 24}${font Monofur:size=8}${template0 0 1}
+${voffset 10}${GOTO 50}${font}Usage: ${font Monofur:size=8}${COLOR0}${memperc}%${alignr}${font Monofur:size=8}${memmax}
+${color}${font Monofur:bold:size=8}${GOTO 50}Swap: ${font Monofur:size=8}${COLOR0}${swapperc}%${alignr}${font Monofur:size=8}${swapmax}
+${GOTO 50}${color 00008b}${membar 13,162}
+${voffset 10}${GOTO 50}${swapbar 13,162}
+${voffset 12}${font Monofur:size=7}${template0 0 1}
 ${template0 1 2}
 ${template0 2 3}
 ${template0 3 4}
diff --git a/configs/conky_system b/configs/conky_system
index 91a3304..af63973 100644
--- a/configs/conky_system
+++ b/configs/conky_system
@@ -17,7 +17,7 @@ conky.config = {
 	minimum_width = 215, 
 	minimum_height = 165,
 	maximum_width = 215,
-	gap_x = 670,
+	gap_x = 900,
 	gap_y = 50,
 
 -- ------------------------- Font
diff --git a/configs/conky_wifi b/configs/conky_wifi
new file mode 100644
index 0000000..c249b8a
--- /dev/null
+++ b/configs/conky_wifi
@@ -0,0 +1,65 @@
+conky.config = {
+-- ------------------------- Windows Settings
+	own_window = true,
+	own_window_type = 'normal',
+	own_window_transparent = false,
+	own_window_hints = 'undecorated,sticky,below,skip_taskbar,skip_pager',
+	own_window_argb_visual = true,
+	own_window_argb_value = 0,
+
+	double_buffer = true,
+
+-- ------------------------- Position
+	alignment = 'top_right',
+
+	minimum_width = 210,
+	minimum_height = 165,
+	maximum_width = 210,
+	gap_x = 0,
+	gap_y = 50,
+
+-- ------------------------- Font
+	use_xft = true,
+	xftalpha = 0.8,
+	override_utf8_locale = true,
+
+	draw_shades = false,
+
+	draw_borders = false,
+	draw_outline = false,
+	draw_graph_borders = false,
+
+	font = 'Monofur:bold:size=8',
+
+-- ------------------------- Color
+	default_color = 'DCDCDC',
+	color0 = '3399FF',
+	color4 = '555555',
+	color5 = '00008b',
+
+
+-- ------------------------- OTHER
+	update_interval = 1,
+};
+
+conky.text = [[
+${voffset -18}${if_existing /proc/net/route wlan0}${voffset 25}${GOTO 50}${font Monofur:bold:size=12}Wifi
+${GOTO 50}${font}Public: ${color0}${font Monofur:size=8}${GOTO 100}${texeci 36000 wget -qO - http://ipecho.net/plain | tail}${color}
+${voffset 5}${GOTO 50}${font}Local:  ${color0}${font Monofur:size=8}${GOTO 100}${addrs wlan0}${color}
+${voffset 5}${GOTO 40}${upspeedgraph   wlan0 10,135 00008b 3399FF}
+${voffset 5}${GOTO 40}${downspeedgraph wlan0 15,135 00008b 3399FF}
+
+${voffset 5}${GOTO 45}${font Monofur:size=7}Receive: ${font Monofur:size=7}${color0}${downspeed wlan0}${GOTO 125}${font Monofur:size=7}${color}Send: ${font Monofur:size=7}${color0}${upspeed wlan0}
+${voffset 5}${GOTO 45}${color}AP_MAC: ${wireless_ap wlan0}
+${voffset 5}${GOTO 45}${color}AP_ESSID: ${COLOR0}${wireless_essid wlan0}
+${voffset 5}${GOTO 45}${color}Bitrate: ${COLOR0}${wireless_bitrate wlan0}
+${voffset 5}${GOTO 45}${color}Quality_bar: ${COLOR5}${wireless_link_bar 10,60 wlan0}
+${voffset 5}${GOTO 45}${color}Quality: ${COLOR0}${wireless_link_qual wlan0}
+${voffset 5}${GOTO 45}${color}Quality_MAX: ${COLOR0}${wireless_link_qual_max wlan0}
+${voffset 5}${GOTO 45}${color}Quality: ${COLOR0}${wireless_link_qual_perc wlan0} %
+${voffset 5}${GOTO 45}${color}Mode: ${COLOR0}${wireless_mode wlan0}
+
+${if_match "${wireless_link_qual_perc wlan0}"<"33"}${image ~/.conky/conky-xanimos/img/networklow.png -p 0,-0.7 -s 45x45}${else}${if_match "${wireless_link_qual_perc wlan0}"<"66"}${image ~/.conky/conky-xanimos/img/networkmid.png -p 0,-0.7}${else}${image ~/.conky/conky-xanimos/img/networkhigh.png -p 0,-0.7}${endif}${endif}${else}${voffset 27}${GOTO 50}${font}Network
+${GOTO 50}${font}No connection
+${image ~/.conky/conky-xanimos/img/nonetwork.png -p 0,-0.7}${endif}
+]];
diff --git a/conky_start.sh b/conky_start.sh
index 4cf3fe8..53f506c 100755
--- a/conky_start.sh
+++ b/conky_start.sh
@@ -8,5 +8,6 @@ conky -p 6 -c ~/.conky/conky-xanimos/configs/conky_system &
 conky -p 5 -c ~/.conky/conky-xanimos/configs/conky_cpu &
 conky -p 7 -c ~/.conky/conky-xanimos/configs/conky_ram
 conky -p 4 -c ~/.conky/conky-xanimos/configs/conky_network &
+conky -p 4 -c ~/.conky/conky-xanimos/configs/conky_wifi &
 
 exit
diff --git a/img/networkwired.png b/img/networkwired.png
new file mode 100644
index 0000000..dd6982c
Binary files /dev/null and b/img/networkwired.png differ
diff --git a/img/networkwiredoff.png b/img/networkwiredoff.png
new file mode 100644
index 0000000..eb05bb5
Binary files /dev/null and b/img/networkwiredoff.png differ