diff --git a/.conkyrc b/.conkyrc
index 7da5c95..3c0db46 100644
--- a/.conkyrc
+++ b/.conkyrc
@@ -1,7 +1,7 @@
 #========================================================================
 # Naira Conky Theme
 # Author: Akamaru
-# Homepage: http://akamaru.de | http://ponywave.de
+# Homepage: https://akamaru.de
 #========================================================================
 
 background yes
@@ -21,9 +21,9 @@ gap_y 5
 minimum_size 190 350
 maximum_width 320
 own_window yes
-own_window_type override
+own_window_type normal
 own_window_transparent no
-own_window_hints undecorate,sticky,skip_taskbar,skip_pager,below
+own_window_hints undecorated,sticky,skip_taskbar,skip_pager,below
 border_inner_margin 0
 border_outer_margin 0
 alignment bl
@@ -40,10 +40,10 @@ xftalpha 0.5
 uppercase no
 
 color0 FFFFFF
-color1 7F006E		
-color2 FF7FED	
+color1 7F006E
+color2 FF7FED
 color3 C4C4C4
-color4 ADADAD	
+color4 ADADAD
 color5 636363
 
 TEXT
@@ -54,7 +54,6 @@ ${color2}${font :Bold:size=12} $alignc ${time %d}. ${time %B} ${time %Y}${font :
 ${color2}$alignc${time %A}
 ${color2}$alignc Uptime $uptime
 ${color2}$alignc $sysname | $kernel | $nodename | $machine
-
 ${color0}CPU & Memory $hr:
 ${color2}CPU Auslastung${color1}$alignr${cpubar 8,130} ${color2}$cpu%@${freq_g cpu}GHz
 ${color1}${cpugraph 15,320 000000 ff0000}
@@ -68,18 +67,17 @@ ${color4}${top name 2}$alignr${top cpu 2} ${top mem 2}
 ${color5}${top name 3}$alignr${top cpu 3} ${top mem 3}
 ${color5}${top name 4}$alignr${top cpu 4} ${top mem 4}
 ${color5}${top name 5}$alignr${top cpu 5} ${top mem 5}
-
-${color2}Festplatten	    Größe     Frei
-${color2}Root${color1}(${fs_type /})${alignr}${color3}${fs_size /}>${color4}${fs_free /}${color1}${alignr}${fs_bar 8,75 /} ${color2}(${fs_used_perc /}%)
-${color2}Dragoran${color1}(${fs_type /home/akamaru/Festplatten/Dragoran/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Dragoran/}>${color4}${fs_free /home/akamaru/Festplatten/Dragoran/}${color1}${alignr}${fs_bar 8,75  /home/akamaru/Festplatten/Dragoran/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Dragoran/}%)
-${color2}Glurak${color1}(${fs_type /home/akamaru/Festplatten/Glurak/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Glurak/}>${color4}${fs_free /home/akamaru/Festplatten/Glurak/}${color1}${alignr}${fs_bar 8,75  /home/akamaru/Festplatten/Glurak/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Glurak/}%)
-${color2}Karnimani${color1}(${fs_type /home/akamaru/Festplatten/Karnimani/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Karnimani/}>${color4}${fs_free /home/akamaru/Festplatten/Karnimani/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Karnimani/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Karnimani/}%)
-${color2}Mauzi${color1}(${fs_type /home/akamaru/Festplatten/Karnimani/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Mauzi/}>${color4}${fs_free /home/akamaru/Festplatten/Mauzi/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Mauzi/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Mauzi/}%)
-${color2}Pikachu${color1}(${fs_type /home/akamaru/Festplatten/Pikachu/})${alignr}${color3}${fs_size /home/akamaru/Festplatten/Pikachu/}>${color4}${fs_free /home/akamaru/Festplatten/Pikachu/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Pikachu/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Pikachu/}%)
-
+${color2}Festplatten			    Größe    Frei
+${color2}Root${color1}${alignr}${color3}${fs_size /}>${color4}${fs_free /}${color1}${alignr}${fs_bar 8,75 /} ${color2}(${fs_used_perc /}%)
+${color2}Flamara${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Flamara/}>${color4}${fs_free /home/akamaru/Festplatten/Flamara/}${color1}${alignr}${fs_bar 8,75  /home/akamaru/Festplatten/Flamara/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Flamara/}%)
+${color2}Kangama${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Kangama/}>${color4}${fs_free /home/akamaru/Festplatten/Kangama/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Kangama/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Kangama/}%)
+${color2}Kokowei${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Kokowei/}>${color4}${fs_free /home/akamaru/Festplatten/Kokowei/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Kokowei/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Kokowei/}%)
+${color2}Nebulak${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Nebulak/}>${color4}${fs_free /home/akamaru/Festplatten/Nebulak/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Nebulak/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Nebulak/}%)
+${color2}Relaxo${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Relaxo/}>${color4}${fs_free /home/akamaru/Festplatten/Relaxo/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Relaxo/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Relaxo/}%)
+${color2}Rizeros${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Rizeros/}>${color4}${fs_free /home/akamaru/Festplatten/Rizeros/}${color1}${alignr}${fs_bar 8,75 /home/akamaru/Festplatten/Rizeros/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Rizeros/}%)
+${color2}Tentoxa${color1}${alignr}${color3}${fs_size /home/akamaru/Festplatten/Tentoxa/}>${color4}${fs_free /home/akamaru/Festplatten/Tentoxa/}${color1}${alignr}${fs_bar 8,75  /home/akamaru/Festplatten/Tentoxa/} ${color2}(${fs_used_perc /home/akamaru/Festplatten/Tentoxa/}%)
 ${color0}Netzwerk $hr:
-${color4}LAN${color2} ${alignr}${color2}IP ${addr enp2s0}
-${color2}Download ${downspeed enp2s0}/s ${alignr} $alignr Upload ${upspeed enp2s0}/s
-${color1}${downspeedgraph enp2s0 15,140} ${alignr}${upspeedgraph enp2s0 15,140}
-${color2}Total Download ${totaldown enp2s0} ${alignr}Total Upload ${totalup enp2s0}
-
+${color4}LAN${color2} ${alignr}${color2}IP ${addr eno1}
+${color2}Download ${downspeed eno1}/s ${alignr} $alignr Upload ${upspeed eno1}/s
+${color1}${downspeedgraph eno1 15,140} ${alignr}${upspeedgraph eno1 15,140}
+${color2}Total Download ${totaldown eno1} ${alignr}Total Upload ${totalup eno1}