diff --git a/conkyrc b/conkyrc
index 632ba99..bba9510 100644
--- a/conkyrc
+++ b/conkyrc
@@ -1,45 +1,93 @@
-#!/usr/bin/conky -d -c
-##	.conkyrc configuration
-#update_interval 10.0
-
-alignment top_left
-
-use_xft yes
-xftfont Inconsolata:size=9.5
-xftalpha 0.1
-
-double_buffer yes
-draw_shades yes
-
-own_window_type override
-own_window yes
-own_window_transparent yes
-own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
-
-text_buffer_size 8000
-max_user_text 10000
-
-default_color e1e1e1
-color0 555555
-color1 FCAF3E
-color2 Ivory            #FFFFF0
-#color2 64574e
-color3 a82553
-color4 5e1014
-color5 Red
-color6 a7a7a7
-color7 8888CC
-color8 9d9c61
-color9 525276
-
 minimum_size 280 1394
 maximum_width 600
 gap_x 1
 gap_y 1
+background no
+use_xft yes
+xftfont Inconsolata:size=9.5
+xftalpha 0.1
+own_window yes
+own_window_transparent yes
+own_window_type normal
+own_window_class conky-semi
+own_window_hints undecorated,below,sticky,skip_taskbar,skip_pager
+own_window_argb_visual yes
+own_window_argb_value 255
+draw_shades yes
+default_shade_color 292421
+
+color0 White            #FFFFFF
+color1 Ivory            #FFFFF0
+color2 Ivory2           #EEEEE0
+color3 Ivory3           #CDCDC1
+color4 Tan1             #FFA54F
+color5 Tan2             #EE9A49
+color6 Gray             #7E7E7E
+color7 AntiqueWhite4    #8B8378
+color8 DimGray          #696969
+color9 Tomato           #FF6347
+
+update_interval 5.0
+total_run_times 0
+own_window yes
+own_window_type override
+own_window_colour hotpink
+double_buffer yes
+draw_shades yes
+draw_outline no
+draw_graph_borders yes
+stippled_borders 8
+border_margin 4
+border_width 1
+default_color darkgrey
+default_shade_color black
+default_outline_color black
+alignment top_left
+no_buffers yes
+uppercase no
+cpu_avg_samples 2
+net_avg_samples 2
+override_utf8_locale no
+use_spacer no
 
 TEXT
-${color2}${font DejaVu Sans:size=8}${time %H}${font DejaVu Sans:size=8}:${time %M}
-${color2}${goto 20}${font DejaVu Sans:size=30}${time %H}${font DejaVu Sans:size=28}:${time %M}${color2}${goto 135}${font DejaVu Sans:size=10}${voffset -15}${time %Z}${goto 136}${voffset 12}${font DejaVu Sans:size=6}(${time %z})${color2}${goto 200}${voffset -10}${font :size=15}${time %A %d %B %Y}
-${font Inconsolata:size=10}${execpi 18000 ~/hacks/Small-Hacks/org-mode-appt-check.plx}
+${color #5b6dad}${alignc}${nodename} ${uptime_short}
 
-${color}${font Inconsolata:size=10}${execpi 14400 /usr/bin/cal -B 1 -A 1 | /bin/cat -v | /usr/bin/perl -ne 'next if /^\s*\d+\s*$/; s/\_\^H(\d)/\${color1}$1\${color}/g; print;'}
+${color #5b6dad}CPU: ${color grey}$cpu%
+${color #5b6dad} ${cpugraph 16,140 000000 7f8ed3}
+${color #5b6dad}RAM: $color$mem/$memmax
+${color #5b6dad} ${membar 6,140}
+${color #5b6dad}Swap:$color$swap/$swapmax
+${color #5b6dad} ${swapbar 6,140}
+
+${color #5b6dad}ETH0 Down: $color${downspeed eth0}${alignr} k/s 
+${color #5b6dad} ${downspeedgraph eth0 16,140 000000 7f8ed3 150}
+${color #5b6dad}ETH0 Up:   $color${upspeed eth0}${alignr} k/s 
+${color #5b6dad} ${upspeedgraph eth0 16,140 000000 7f8ed3 18}
+
+${color #5b6dad}File systems:
+${color #5b6dad}/       $color${fs_free /}
+${color #5b6dad} ${fs_bar 6,140 /}
+${color #5b6dad}storage $color${fs_free /mnt/attach}
+${color #5b6dad} ${fs_bar 6,140 /mnt/attach}
+
+${color #5b6dad}Processes:$color $processes | $running_processes
+${color} Cpu usage    CPU
+${color #ddaa00} ${top name 1}${offset -50} ${top cpu 1}
+${color #5b6dad} ${top name 2}${offset -50} ${top cpu 2}
+${color #5b6dad} ${top name 3}${offset -50} ${top cpu 3}
+${color #5b6dad} ${top name 4}${offset -50} ${top cpu 4}
+
+${color} Mem usage    MEM
+${color #ddaa00} ${top_mem name 1}${offset -50} ${top_mem mem 1}
+${color #5b6dad} ${top_mem name 2}${offset -50} ${top_mem mem 2}
+${color #5b6dad} ${top_mem name 3}${offset -50} ${top_mem mem 3}
+${color #5b6dad} ${top_mem name 4}${offset -50} ${top_mem mem 4}
+
+${color #5b6dad}# Connections   
+$color In: ${tcp_portmon 1 32767 count}  Out: ${tcp_portmon 32768 61000 count}${alignr}
+
+$color$stippled_hr
+${color grey}CPU Temperatures:
+ ${color grey}CPU:$color ${hwmon 1 temp 2}℃
+#  ${color grey}Case:$color ${hwmon 1 temp 1}℃ ${color grey}NB:$color ${hwmon 1 temp 3}℃
\ No newline at end of file