diff --git a/setup/linux/include_x/airootfs/etc/skel/.config/conky/base.conf b/setup/linux/include_x/airootfs/etc/skel/.config/conky/base.conf
new file mode 100644
index 00000000..36ce95bc
--- /dev/null
+++ b/setup/linux/include_x/airootfs/etc/skel/.config/conky/base.conf
@@ -0,0 +1,102 @@
+--[[
+WizardKit: Conky Config
+
+Based on the Bunsen Labs / Crunchbang Conky configs.
+]]
+
+conky.config = {
+  -- Window properties
+    background = true,
+    double_buffer = true,
+    own_window = true,
+    own_window_class = 'Conky',
+    own_window_hints = undecorated,below,skip_taskbar,skip_pager,sticky,
+    own_window_transparent = false,
+    own_window_type = 'desktop',
+    own_window_argb_value = 224,
+    own_window_argb_visual = true,
+
+  -- Borders & Graphs
+    border_inner_margin = 5,
+    border_outer_margin = 0,
+    border_width = 2,
+    draw_borders = false,
+    draw_graph_borders = true,
+    show_graph_range = false,
+    show_graph_scale = false,
+    stippled_borders = 5,
+
+  -- Colors
+    -- default_color 656667 # Waldorf original colour
+    -- default_color 7a7a7a # Flame  & Bunsen Grey
+    -- default_color 929292 # Labs Grey
+    color0 = 'B0E0E6', -- PowderBlue
+    color1 = '778899', -- LightSlateGray
+    color2 = 'D8BFD8', -- Thistle
+    color3 = '9ACD32', -- YellowGreen
+    color4 = 'FFA07A', -- LightSalmon
+    color5 = 'FFDEAD', -- NavajoWhite
+    color6 = '00BFFF', -- DeepSkyBlue
+    color7 = '5F9EA0', -- CadetBlue
+    color8 = 'BDB76B', -- DarkKhaki
+    color9 = 'CD5C5C', -- IndianRed
+    default_color = 'C0C0C0', -- Silver
+    default_outline_color = 'black',
+    default_shade_color = 'black',
+
+  -- Font
+    draw_outline = false,
+    draw_shades = false,
+    extra_newline = false,
+    font = 'Inconsolata:bold:size=9',
+    uppercase = false,
+    use_xft = true,
+
+  -- Size & Placement
+    alignment = 'top_right',
+    gap_x = 20,
+    gap_y = 24,
+    maximum_width = 180,
+    minimum_height = 5,
+    minimum_width = 180,
+
+  -- Misc
+    cpu_avg_samples = 2,
+    net_avg_samples = 2,
+    no_buffers = true,
+    out_to_console = false,
+    out_to_ncurses = false,
+    out_to_stderr = false,
+    out_to_x = true,
+    update_interval = 1.0,
+    use_spacer = 'none',
+}
+
+conky.text = [[
+${color}${alignc}S Y S T E M    I N F O
+${hr}
+Date:${alignr}${time %F}
+Time:${alignr}${time %H:%M}
+Uptime:${alignr}${uptime_short}
+
+CPU: ${if_match ${cpu cpu0}<10}  ${cpu cpu0}\
+${else}${if_match ${cpu cpu0}<100} ${cpu cpu0}\
+${else}${cpu cpu0}${endif}${endif}% Used${alignr}${freq_g} GHz
+${cpugraph cpu0 ${gap_x},${width} ${color} ${color}}
+RAM: ${mem} Used${alignr}${memmax}
+${memgraph ${gap_x},${width} ${color} ${color}}
+
+#Network
+${alignc}S H O R T C U T    K E Y S
+${hr}
+[Super] + d${alignr}HW Diagnostics
+[Super] + f${alignr}File Manager
+[Super] + i${alignr}HW Information
+[Super] + m${alignr}Mount Volumes
+[Super] + r${alignr}Run Dialog
+[Super] + s${alignr}SMART Check
+[Super] + t${alignr}Terminal
+[Super] + v${alignr}View Temps
+[Super] + w${alignr}Web Browser
+[Super] + x${alignr}Logout
+]]
diff --git a/setup/linux/include_x/airootfs/etc/skel/.conkyrc_base b/setup/linux/include_x/airootfs/etc/skel/.conkyrc_base
deleted file mode 100644
index af09dd8f..00000000
--- a/setup/linux/include_x/airootfs/etc/skel/.conkyrc_base
+++ /dev/null
@@ -1,165 +0,0 @@
-# For commands above TEXT check:
-# http://conky.sourceforge.net/config_settings.html
-#
-# For commands available below TEXT check:
-# http://conky.sourceforge.net/variables.html
-
-# Bunsen Labs Conky help threads
-# http://crunchbang.org/forums/viewtopic.php?pid=371424#p371424
-
-# beta tested by: smacz
-# Enjoy! :)
-
-# pkill -xf "conky -q -c $HOME/.config/conky/BL-Default.conkyrc" &
-###  Begin Window Settings  #####################
-own_window yes
-#own_window_type override
-own_window_transparent no
-own_window_hints undecorated,below,skip_taskbar,skip_pager,sticky
-own_window_colour 000000
-own_window_class Conky
-#own_window_title Bunsen Labs Default Conky
-own_window_title Default Conky
-
-### ARGB can be used for real transparency
-### NOTE that a composite manager is required for real transparency.
-### This option will not work as desired (in most cases) in conjunction with
-### own_window_type normal
-own_window_argb_visual yes # Options: yes or no
-
-### When ARGB visuals are enabled, this use this to modify the alpha value
-### Use: own_window_type normal
-### Use: own_window_transparent no
-### Valid range is 0-255, where 0 is 0% opacity, and 255 is 100% opacity.
-own_window_argb_value 224
-
-minimum_size 180 0  ### width | height
-maximum_width 180
-
-gap_x 20    ### left | right
-gap_y 24    ### up | down
-
-alignment tr
-#######################  End Window Settings  ###
-###  Font Settings  #############################
-# Use Xft (anti-aliased font and stuff)
-use_xft yes
-xftfont Inconsolata:bold:size=9
-#xftfont Liberation Sans:size=9
-
-# Alpha of Xft font. Must be a value at or between 1 and 0 ###
-xftalpha 1
-# Force UTF8? requires XFT ###
-override_utf8_locale yes
-
-uppercase no
-#########################  End Font Settings  ###
-###  Colour Settings  ###########################
-draw_shades no #yes
-default_shade_color 000000
-
-draw_outline no # amplifies text if yes
-default_outline_color 000000
-
-#default_color 656667 # Waldorf original colour
-#default_color 7a7a7a # Flame  & Bunsen Grey
-#default_color 929292 # Labs Grey
-default_color C0C0C0 # Silver
-color0 B0E0E6 # PowderBlue
-color1 778899 # LightSlateGray
-color2 D8BFD8 # Thistle
-color3 9ACD32 # YellowGreen
-color4 FFA07A # LightSalmon
-color5 FFDEAD # NavajoWhite
-color6 00BFFF # DeepSkyBlue
-color7 5F9EA0 # CadetBlue
-color8 BDB76B # DarkKhaki
-color9 CD5C5C # IndianRed
-#######################  End Colour Settings  ###
-###  Borders Section  ###########################
-draw_borders no
-# Stippled borders?
-stippled_borders 5
-# border margins
-border_inner_margin 5
-border_outer_margin 0
-# border width
-border_width 2
-# graph borders
-draw_graph_borders yes #no
-#default_graph_size 15 40
-#######################  End Borders Section  ###
-###  Miscellaneous Section  #####################
-# Boolean value, if true, Conky will be forked to background when started.
-background yes
-
-# Adds spaces around certain objects to stop them from moving other things
-# around, this only helps if you are using a mono font
-# Options: right, left or none
-use_spacer none
-
-# Default and Minimum size is 256 - needs more for single commands that
-# "call" a lot of text IE: bash scripts
-text_buffer_size 6144
-
-# Subtract (file system) buffers from used memory?
-no_buffers yes
-
-# change GiB to G and MiB to M
-short_units yes
-
-# Like it says, ot pads the decimals on % values
-# doesn't seem to work since v1.7.1
-pad_percents 2
-
-# Imlib2 image cache size, in bytes. Default 4MiB Increase this value if you use
-# $image lots. Set to 0 to disable the image cache.
-imlib_cache_size 0
-
-# Use the Xdbe extension? (eliminates flicker)
-# It is highly recommended to use own window with this one
-# so double buffer won't be so big.
-double_buffer yes
-
-#   Maximum size of user text buffer, i.e. layout below TEXT line in config file
-#  (default is 16384 bytes)
-# max_user_text 16384
-
-# Desired output unit of all objects displaying a temperature. Parameters are
-# either "fahrenheit" or "celsius". The default unit is degree Celsius.
-# temperature_unit Fahrenheit
-
-#################  End Miscellaneous Section  ###
-#### ${font Monospace:bold:size=10}${alignc}${execpi 600 $HOME/.config/conky/scripts/bunsenweather.sh}
-update_interval 1
-
-TEXT
-${color}${alignc}S Y S T E M    I N F O
-${hr}
-Date:${alignr}${time %F}
-Time:${alignr}${time %H:%M}
-Uptime:${alignr}${uptime_short}
-
-CPU: ${if_match ${cpu cpu0}<10}  ${cpu cpu0}\
-${else}${if_match ${cpu cpu0}<100} ${cpu cpu0}\
-${else}${cpu cpu0}${endif}${endif}% Used${alignr}${freq_g} GHz
-${cpugraph cpu0 ${gap_x},${width} ${color} ${color}}
-RAM: ${mem} Used${alignr}${memmax}
-${memgraph ${gap_x},${width} ${color} ${color}}
-Disk I/O:
-${diskiograph ${gap_x},${width} ${color} ${color}}
-Down:  ${downspeed}${goto 115}Up:${alignr}${upspeed}
-
-#Network
-${alignc}S H O R T C U T    K E Y S
-${hr}
-[Super] + d${alignr}HW Diagnostics
-[Super] + f${alignr}File Manager
-[Super] + i${alignr}HW Information
-[Super] + m${alignr}Mount Volumes
-[Super] + r${alignr}Run Dialog
-[Super] + s${alignr}SMART Check
-[Super] + t${alignr}Terminal
-[Super] + v${alignr}View Temps
-[Super] + w${alignr}Web Browser
-[Super] + x${alignr}Logout
diff --git a/setup/linux/include_x/airootfs/etc/skel/.update_conky b/setup/linux/include_x/airootfs/etc/skel/.update_conky
index 653f90eb..0e1445df 100755
--- a/setup/linux/include_x/airootfs/etc/skel/.update_conky
+++ b/setup/linux/include_x/airootfs/etc/skel/.update_conky
@@ -1,9 +1,9 @@
 #!/bin/bash
 # vim: sts=2 sw=2 ts=2
 
-CONFIG_BASE="${HOME}/.conkyrc_base"
-CONFIG_NEW="${HOME}/.conkyrc_new"
-CONFIG_REAL="${HOME}/.conkyrc"
+CONFIG_BASE="${HOME}/.config/conky/base.conf"
+CONFIG_NEW="${HOME}/.config/conky/new.conf"
+CONFIG_REAL="${HOME}/.config/conky/conky.conf"
 
 IF_LIST=($(ip l \
   | egrep '^[0-9]+:\s+(eth|en|wl)' \
@@ -22,6 +22,7 @@ for i in "${IF_LIST[@]}"; do
     sed -i -r "s/#Network/Wireless:\${alignr}\${addr $i}\n#Network/" "${CONFIG_NEW}"
   fi
 done
+sed -i -r "s/#Network//" "${CONFIG_NEW}"
 
 # Replace config if there were changes
 if ! diff -q "${CONFIG_NEW}" "${CONFIG_REAL}" >/dev/null 2>&1; then