diff --git a/.config/conky/primary.conf b/.config/conky/primary.conf
index 7ffbbb10..3a0ab29a 100644
--- a/.config/conky/primary.conf
+++ b/.config/conky/primary.conf
@@ -61,20 +61,26 @@ ${top_mem name 1}$alignr${color9}${top_mem mem 1}%$color
 ${top_mem name 2}$alignr${color9}${top_mem mem 2}%$color
 ${top_mem name 3}$alignr${color9}${top_mem mem 3}%$color
 ${color3}$hr$color
-${font Roboto:style=Medium:size=10}Disk$font (R/W): ${fs_free /home} free$alignr${diskio /dev/sda}/s
+${font Roboto:style=Medium:size=10}Disk$font (R/W):$alignr${diskio /dev/sda}
 ${color7}${diskiograph_read /dev/sda 40,200} ${diskiograph_write /dev/sda 40,200}$color
+/$alignr${fs_free /} ${color7}${fs_bar 11,130 /}$color
+/home$alignr${fs_free /home} ${color7}${fs_bar 11,130 /home}$color
+/boot$alignr${fs_free /boot} ${color7}${fs_bar 11,130 /boot}$color
+/boot/efi$alignr${fs_free /boot/efi} ${color7}${fs_bar 11,130 /boot/efi}$color
+
 ${top_io name 1}$alignr${color7}${top_io io_perc 1}%$color
 ${top_io name 2}$alignr${color7}${top_io io_perc 2}%$color
 ${top_io name 3}$alignr${color7}${top_io io_perc 3}%$color
-${color3}$hr$color${if_up wlp1s0}
-${font Roboto:style=Medium:size=10}WLAN$font (U/D):$alignr${addr wlp1s0} on $wireless_essid
+${color3}$hr$color
+${font Roboto:style=Medium:size=10}Network$font:${alignr}Default $gw_iface${if_up wlp1s0}
+wlp1s0 (U/D):$alignr${addr wlp1s0} / ${wireless_essid wlp1s0}
 ${color6}${upspeedgraph wlp1s0 40,200} ${downspeedgraph wlp1s0 40,200}$color$endif${if_up wlp5s0}
-${font Roboto:style=Medium:size=10}WLAN$font (U/D):$alignr${addr wlp5s0} on $wireless_essid
+wlp5s0 (U/D):$alignr${addr wlp5s0} / ${wireless_essid wlp5s0}
 ${color6}${upspeedgraph wlp5s0 40,200} ${downspeedgraph wlp5s0 40,200}$color$endif${if_up enp0s31f6}
-${font Roboto:style=Medium:size=10}Ethernet$font (U/D):$alignr${addr enp0s31f6}
+enp0s31f6 (U/D):$alignr${addr enp0s31f6}
 ${color6}${upspeedgraph enp0s31f6 40,200} ${downspeedgraph enp0s31f6 40,200}$color$endif${if_up eno1}
-${font Roboto:style=Medium:size=10}Ethernet$font (U/D):$alignr${addr eno1}
+eno1 (U/D):$alignr${addr eno1}
 ${color6}${upspeedgraph eno1 40,200} ${downspeedgraph eno1 40,200}$color$endif${if_up enp0s20f0u2}
-${font Roboto:style=Medium:size=10}USB Tether$font (U/D):$alignr${addr enp0s20f0u2}
+enp0s20f0u2 (U/D):$alignr${addr enp0s20f0u2}
 ${color6}${upspeedgraph enp0s20f0u2 40,200} ${downspeedgraph enp0s20f0u2 40,200}$color$endif
 ]]