diff --git a/.config/polybar/config b/.config/polybar/config
index 2c92f66..bcb4c6d 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -23,213 +23,75 @@ border = ${xrdb:i3_focused}
 urgent = ${xrdb:i3_urgent}
 focused = ${xrdb:i3_focused}
 unfocused = ${xrdb:foreground}
+[bar/master]
+background = ${colors.background}
+foreground = ${colors.foreground}
+fixed-center = true
+font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
+font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;1
+line-size = 1
+module-margin-left = 1
+module-margin-right = 1
+monitor = ${env:MONITOR:DP-4}
+padding= 2
+separator =|
+override-redirect = true
 
-; Bars
+[bar/border]
+inherit="bar/master"
+border-size=2
+border-color=${colors.border}
+radius = 15.0
 
 [bar/floating]
-modules-left = sysinfo button_pavucontrol
-modules-center = cava
+inherit="bar/border"
+bottom = true
+enable-ipc = false
+height = 40px
+width = 60%
 ;modules-center = cava clock playerctl_long
+modules-center = cava
+modules-left = floating_popup_button pavucontrol_button
 modules-right = sensors_cpu_pc nvgpu memory 
 monitor = ${env:MONITOR:DP-4}
-width = 60%
-height = 40px
 offset-x = 20%
 offset-y = 8px
-fixed-center = true
-background = ${colors.background}
-foreground = ${colors.foreground}
-line-size = 1
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding= 2
-border-size=2
-border-color=${colors.border}
-radius = 15.0
-font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
-font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;1
-enable-ipc = false
-bottom = true
-
 override-redirect = true
-tray-position = left
-tray-padding = 3
-tray-offset-x=86
-tray-offset-y = 4px
 tray-detached = true
 tray-maxsize = 15
+tray-offset-x=86
+tray-offset-y = 4px
+tray-padding = 3
+tray-position = left
 tray-scale = 0.8
 
-[bar/floating_sysinfo]
-modules-left = disk_short_pc checkupdates ovpn nvpn eth_pc 
-monitor = ${env:MONITOR:DP-4}
-width = 22%
+[bar/floating_popup]
+inherit="bar/border"
+bottom = true
+enable-ipc = true
 height = 40px
+width = 22%
+modules-left = disk_short_pc checkupdates ovpn nvpn eth_pc 
 offset-x = 20%
 offset-y = 58px
-fixed-center = true
-background = ${colors.background}
-forFeground = ${colors.foreground}
-line-size = 1
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding= 2
-font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
-font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;1
-enable-ipc = true
-bottom = true
-border-size=2
-border-color=${colors.border}
-radius = 15.0
-override-redirect = true
 
 [bar/floating_wm]
-modules-center = i3
-monitor = ${env:MONITOR:DP-4}
-width = 100%
-height = 15
-fixed-center = true
-background = ${colors.transparent}
-foreground = ${colors.foreground}
-line-size = 1
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding= 4
+inherit="bar/master"
 font-0 = dark forest:style=Bold:fontformat=truetype:pixelsize=10;4
-font-1 = Material Design Icons:pixelsize=8.25:antialias=true;4
-enable-ipc = true
-bottom = false
-radius = 15.0
-wm-restack = i3
-override-redirect = true
-
-; Bars Yoga3
-
-[bar/yoga3_primary_landscape]
-; not used: songname menu-media xbacklightbuttons 
-modules-left =  i3touchmenu checkupd ovpn nvpn usbmodem1 usbmodem2 usbmodem3 usbmodem4 eth_yoga3 wlan
-modules-center =  xbacklight i3 volume
-modules-right = sensors_cpu_yoga3 memory disk_short_yoga3 battery clock
-monitor = ${env:MONITOR:eDP1}
+height = 15
 width = 100%
-bottom=false
-height = 20
-fixed-center = true
-background = #000
-foreground = #fff
-line-size = 3
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding-right= 2
-font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
-font-1 = Font Font Awesome 5 Free Solid:style=Solid:fontformat=truetype:pixelsize=10:antialias=true;0
-font-2 = Font Awesome 5 Free:fontformat=truetype:pixelsize=10:antialias=true;0
-tray-position = left
-tray-padding = 9
-tray-detached = false
-tray-maxsize = 15
-tray-background = ${root.background}
-tray-scale = 1.0
-enable-ipc = true
+modules-center = i3
+padding= 4
+wm-restack = i3; Module popup
 
-[bar/yoga3_primary_portrait]
-; not used: songname menu-media update disk eth
-modules-left =  i3touchmenu xbacklightbuttons ovpn nvpn usbmodem1 usbmodem2 usbmodem3 wlanshort
-modules-center = xbacklight i3 volume
-modules-right = cpu memory temperature batteryshort clock
-monitor = ${env:MONITOR:eDP1}
-width = 100%
-height = 20
-fixed-center = true
-background = ${colors.background}
-foreground = ${colors.foreground}
-line-size = 3
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding-right= 2
-font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
-font-1 = Font Font Awesome 5 Free Solid:style=Solid:fontformat=truetype:pixelsize=10:antialias=true;0
-font-2 = Font Awesome 5 Free:fontformat=truetype:pixelsize=10:antialias=true;0
-tray-position = left
-tray-padding = 9
-tray-detached = false
-tray-maxsize = 15
-tray-background = ${root.background}
-tray-scale = 1.0
-enable-ipc = true
-
-; Bars PC
-
-[bar/pc_primary_landscape]
-modules-left =  disk_short_pc checkupdates ovpn nvpn eth_pc playerctl
-modules-center =  i3
-modules-right = sensors_cpu_pc nvgpu memoryclock
-monitor = ${env:MONITOR:DP-4}
-width = 100%
-height = 18
-fixed-center = true
-background = ${colors.background}
-foreground = ${colors.foreground}
-line-size = 1
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding-right= 2
-font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
-font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;2
-tray-position = left
-tray-padding = 9
-tray-detached = false
-tray-maxsize = 15
-tray-background = ${root.background}
-tray-scale = 1
-enable-ipc = true
-override-redirect = true
-
-[bar/pc_vnc_landscape]
-modules-left =  disk_short_pc checkupd ovpn nvpn eth_pc
-modules-center =  i3
-modules-right = sensors_cpu_pc memoryclock
-monitor = ${env:MONITOR:VNC-0}
-width = 100%
-height = 18
-fixed-center = true
-background = ${colors.background}
-foreground = ${colors.foreground}
-line-size = 3
-line-color = #000
-separator =|
-module-margin-left = 1
-module-margin-right = 1
-padding-right= 2
-font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
-font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;0
-tray-position = left
-tray-padding = 9
-tray-detached = false
-tray-maxsize = 15
-tray-background = ${root.background}
-tray-scale = 1.0
-enable-ipc = true
-
-; Modules
-
-[module/button_pavucontrol]
-type = custom/text
-content = 󰕾 |
-click-left = "setsid pavucontrol"
-click-middle = "bash ~/Userdata/Scripts/Launchers/restart_pulseaudio_1s.sh"
+[module/floating_popup_button]
+type = custom/script
+interval = 0.5
+format = <label>
+label-maxlen = 5
+exec = ~/.config/polybar/scripts/polypopup.sh
+click-left = ~/.config/polybar/scripts/polypopup.sh --toggle
+content = 󰋼
 
 ; Module Date
 
@@ -260,8 +122,22 @@ click-right = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update
 click-middle = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --update-noconfirm"
 
 ; Module HW-Statistics
+; For 'sensors_'-modules, run 'sensors-detect' from 'lm_sensors' first
+
+[module/memory]
+type = internal/memory
+interval = 2
+label = 󰆼 %percentage_used%%
+
+[module/nvgpu]
+type = custom/script
+interval = 2
+format = 󰹑 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((nvidia-smi -q | grep "Gpu" | awk -F':' '{print $2}' | tr -d ' '; echo ", "; nvidia-smi -q | grep "GPU Current Temp" | awk -F':' '{print $2}' | tr -d ' C' ; echo '°') | cat | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c nvtop"
 
-; run 'sensors-detect' from 'lm_sensors' first
 [module/sensors_cpu_pc]
 type = custom/script
 interval = 2
@@ -280,21 +156,6 @@ label-ellipsis=true
 exec = "echo $((top -bn1 | grep 'Cpu(s)' | sed 's/.*, *\([0-9.]*\)%* id.*/\1/' | awk -F '.' '{print 100 - $1}' ; echo '%, ' ; sensors | grep "Package id 0:" | awk -F' ' '{print $4}' | awk -F'.' '{print $1}' | tr -d '+'; echo '°') | tr -d '\n')"
 click-left = "setsid alacritty -e sh -c htop"
 
-[module/memory]
-type = internal/memory
-interval = 2
-label = 󰆼 %percentage_used%%
-
-[module/nvgpu]
-type = custom/script
-interval = 2
-format = 󰹑 <label>
-label-maxlen=15
-label-ellipsis=true
-;exec = "echo $(nvidia-settings -q GPUUtilization | awk -F'=' '{print $3}' | awk '{print $1}' | sed 's/\,/%/g')"
-exec = "echo $((nvidia-smi -q | grep "Gpu" | awk -F':' '{print $2}' | tr -d ' '; echo ", "; nvidia-smi -q | grep "GPU Current Temp" | awk -F':' '{print $2}' | tr -d ' C' ; echo '°') | cat | tr -d '\n')"
-click-left = "setsid alacritty -e sh -c nvtop"
-
 ; Module Network Interfaces
 
 [module/wlan]
@@ -304,11 +165,8 @@ interval = 3
 format-connected = <label-connected>
 label-connected = %ifname%: %local_ip% [%essid%]
 
-[module/wlanshort]
-type = internal/network
-interface = wlp2s0
-interval = 3
-format-connected = <label-connected>
+[module/wlan_short]
+inherit="module/wlan"
 label-connected = %essid%
 
 [module/eth_pc]
@@ -319,35 +177,26 @@ format-connected = <label-connected>
 label-connected = 󰈀 %local_ip%
 
 [module/eth_yoga3]
-type = internal/network
+inherit="module/eth_pc"
 interface = enp0s31f6
-interval = 3
-format-connected = <label-connected>
-label-connected = eth: %local_ip%
 
 [module/usbmodem1]
 type = custom/script
 format = usb: <label>
 interval = 3
-exec = echo $(ip -4 addr show enp0s20f0u1 2>&1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u1
 
 [module/usbmodem2]
-type = custom/script
-format = usb: <label>
-interval = 3
-exec = echo $(ip -4 addr show enp0s20f0u6 2>&1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u6
 
 [module/usbmodem3]
-type = custom/script
-format = usb: <label>
-interval = 3
-exec = echo $(ip -4 addr show enp0s20f0u3 2>&1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u3
 
 [module/usbmodem4]
-type = custom/script
-format = usb: <label>
-interval = 3
-exec = echo $(ip -4 addr show ens8u1u2 2>&1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh ens8u1u2
 
 ; Module VPN
 
@@ -360,11 +209,8 @@ label-ellipsis=true
 exec = echo $(nmcli con show --active | grep vpn | cut -c1-12 | tr -d ' ')
 
 [module/nvpn]
-type = custom/script
-interval = 3
+inherit="module/ovpn"
 format = nvpn: <label>
-label-maxlen=50
-label-ellipsis=true
 exec = echo $(nordvpn status | grep -oP '(?<=Current server: ).*' | cut -f1 -d'.')
 
 ; Module Volume + Media
@@ -380,15 +226,6 @@ format-muted-foreground = ${root.foreground}
 label-muted =  x
 interval = 1
 
-[module/sysinfo]
-type = custom/script
-interval = 0.5
-format = <label>
-label-maxlen = 5
-exec = ~/.config/polybar/scripts/polypopup.sh
-click-left = ~/.config/polybar/scripts/polypopup.sh --toggle
-content = 󰋼
-
 [module/playerctl]
 type = custom/script
 tail = true
@@ -401,12 +238,7 @@ click-middle = "playerctl previous"
 inherit="module/playerctl"
 exec = bash ~/.config/polybar/scripts/modules/playerctl.sh 30
 
-[module/cava]
-type = custom/script
-tail = true
-exec = python /home/sim/.config/polybar/scripts/modules/cava.py
-
-[module/playerctl-buttons]
+[module/playerctl_buttons]
 type = custom/menu
 expand-right = true
 label-open = 
@@ -419,6 +251,17 @@ menu-0-1-exec = "playerctl play-pause"
 menu-0-2 = 
 menu-0-2-exec = "playerctl next"
 
+[module/pavucontrol_button]
+type = custom/text
+content = 󰕾 |
+click-left = "setsid pavucontrol"
+click-middle = "bash ~/Userdata/Scripts/Launchers/restart_pulseaudio_1s.sh"
+
+[module/cava]
+type = custom/script
+tail = true
+exec = python /home/sim/.config/polybar/scripts/modules/cava.py
+
 ; Module Battery
 
 [module/battery]
@@ -431,12 +274,8 @@ label-full = bat: %percentage%%
 label-charging = bat: %percentage%% (+%consumption%W, %time%)
 label-discharging = bat: %percentage%% (-%consumption%W, %time%)
 
-[module/batteryshort]
-type = internal/battery
-battery = BAT0
-poll-interval = 3
-adapter = ADP1
-full-at = 95
+[module/battery_short]
+inherit = "module/battery"
 label-full = bat: %percentage%%
 label-charging = bat: %percentage%%
 label-discharging = bat: %percentage%%
@@ -448,7 +287,6 @@ type = custom/script
 format = 󰆓 <label>
 interval = 10
 exec = echo $(df -h / | tail +2 | awk -F ' ' '{print $3 " / " $2 " (" $5 ")"}' | tr -d 'G')
-
 click-left = "setsid alacritty -e sh -c 'echo Disk overview... ; echo ; df -h -x tmpfs; echo ; read -p Done'"
 click-right = "setsid alacritty -e sh -c 'echo Scanning main disk ; echo ; ncdu --exclude /data / ; echo ; read -p Done!'"
 click-middle = "setsid alacritty -e sh -c 'echo Scanning full disk... ; echo ; sudo ncdu / ; echo ; read -p Done!'"
@@ -458,11 +296,8 @@ inherit = "module/disk_short_pc"
 format = | 󰆓 <label>
 
 [module/disk_short_yoga3]
-type = custom/script
-format = dsk: <label>
-interval = 10
+inherit = "module/disk_short_pc"
 exec = echo $(df -h / | tail +2 | awk -F ' ' '{print $3 " / " $2 " (" $5 ")"}' | tr -d 'G')
-click-left = "setsid alacritty -e sh -c 'ncdu /'"
 
 ; Module Backlight
 
@@ -471,7 +306,7 @@ type = internal/xbacklight
 format = <label>
 label = %percentage% 
 
-[module/xbacklightbuttons]
+[module/xbacklight_buttons]
 type = custom/menu
 expand-right = true
 label-open = blght
@@ -481,9 +316,6 @@ menu-0-0 = -
 menu-0-0-exec = "xbacklight -dec 10; notify-send 'brightness down'"
 menu-0-1 = +
 menu-0-1-exec = "xbacklight -inc 10; notify-send 'brightness up'"
-
-; Module Window Manager
-
 [global/wm]
 margin-top = 0
 margin-bottom = 0
diff --git a/.config/polybar/config-merge/c00-config-help b/.config/polybar/config-merge/c00-config-help
new file mode 100644
index 0000000..0eabbdd
--- /dev/null
+++ b/.config/polybar/config-merge/c00-config-help
@@ -0,0 +1,9 @@
+;=====================================================;
+;                                                     ;
+;   To learn more about how to configure Polybar      ;
+;   go to https://github.com/jaagr/polybar            ;
+;                                                     ;
+;   The README contains alot of information           ;
+;                                                     ;
+;=====================================================;
+
diff --git a/.config/polybar/config-merge/c01-config-settings b/.config/polybar/config-merge/c01-config-settings
new file mode 100644
index 0000000..3866881
--- /dev/null
+++ b/.config/polybar/config-merge/c01-config-settings
@@ -0,0 +1,16 @@
+; Global Settings
+
+[settings]
+screenchange-reload = true
+
+[colors]
+transparent = #00ffffff
+background = ${xrdb:background}
+foreground = ${xrdb:foreground}
+foreground-alt = ${xrdb:highlight}
+
+border = ${xrdb:i3_focused}
+
+urgent = ${xrdb:i3_urgent}
+focused = ${xrdb:i3_focused}
+unfocused = ${xrdb:foreground}
diff --git a/.config/polybar/config-merge/c02-config-bars b/.config/polybar/config-merge/c02-config-bars
new file mode 100644
index 0000000..92dd823
--- /dev/null
+++ b/.config/polybar/config-merge/c02-config-bars
@@ -0,0 +1,60 @@
+[bar/master]
+background = ${colors.background}
+foreground = ${colors.foreground}
+fixed-center = true
+font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
+font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;1
+line-size = 1
+module-margin-left = 1
+module-margin-right = 1
+monitor = ${env:MONITOR:DP-4}
+padding= 2
+separator =|
+override-redirect = true
+
+[bar/border]
+inherit="bar/master"
+border-size=2
+border-color=${colors.border}
+radius = 15.0
+
+[bar/floating]
+inherit="bar/border"
+bottom = true
+enable-ipc = false
+height = 40px
+width = 60%
+;modules-center = cava clock playerctl_long
+modules-center = cava
+modules-left = floating_popup_button pavucontrol_button
+modules-right = sensors_cpu_pc nvgpu memory 
+monitor = ${env:MONITOR:DP-4}
+offset-x = 20%
+offset-y = 8px
+override-redirect = true
+tray-detached = true
+tray-maxsize = 15
+tray-offset-x=86
+tray-offset-y = 4px
+tray-padding = 3
+tray-position = left
+tray-scale = 0.8
+
+[bar/floating_popup]
+inherit="bar/border"
+bottom = true
+enable-ipc = true
+height = 40px
+width = 22%
+modules-left = disk_short_pc checkupdates ovpn nvpn eth_pc 
+offset-x = 20%
+offset-y = 58px
+
+[bar/floating_wm]
+inherit="bar/master"
+font-0 = dark forest:style=Bold:fontformat=truetype:pixelsize=10;4
+height = 15
+width = 100%
+modules-center = i3
+padding= 4
+wm-restack = i3
\ No newline at end of file
diff --git a/.config/polybar/config-merge/c03-config-modules-misc b/.config/polybar/config-merge/c03-config-modules-misc
new file mode 100644
index 0000000..193b5d4
--- /dev/null
+++ b/.config/polybar/config-merge/c03-config-modules-misc
@@ -0,0 +1,234 @@
+; Module popup
+
+[module/floating_popup_button]
+type = custom/script
+interval = 0.5
+format = <label>
+label-maxlen = 5
+exec = ~/.config/polybar/scripts/polypopup.sh
+click-left = ~/.config/polybar/scripts/polypopup.sh --toggle
+content = 󰋼
+
+; Module Date
+
+[module/clock]
+type = internal/date
+interval = 1
+date =
+date-alt =%d.%m.%Y
+time =" %H:%M"
+time-alt =%H:%M:%S,
+label =%time% %date% 
+
+[module/clock_icon]
+inherit = "module/clock"
+date = 󰥔
+
+; Module Updates
+
+[module/checkupdates]
+type = custom/script
+interval = 30
+format = 󰂪 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $(bash ~/.config/polybar/scripts/modules/update.sh --count-short)"
+click-left = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --list"
+click-right = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --update"
+click-middle = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --update-noconfirm"
+
+; Module HW-Statistics
+; For 'sensors_'-modules, run 'sensors-detect' from 'lm_sensors' first
+
+[module/memory]
+type = internal/memory
+interval = 2
+label = 󰆼 %percentage_used%%
+
+[module/nvgpu]
+type = custom/script
+interval = 2
+format = 󰹑 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((nvidia-smi -q | grep "Gpu" | awk -F':' '{print $2}' | tr -d ' '; echo ", "; nvidia-smi -q | grep "GPU Current Temp" | awk -F':' '{print $2}' | tr -d ' C' ; echo '°') | cat | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c nvtop"
+
+[module/sensors_cpu_pc]
+type = custom/script
+interval = 2
+format = 󰍛 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((top -bn1 | grep 'Cpu(s)' | sed 's/.*, *\([0-9.]*\)%* id.*/\1/' | awk -F '.' '{print 100 - $1}' ; echo '%, ' ; sensors | grep "CPUTIN" | awk -F' ' '{print $2}' | awk -F'.' '{print $1}' | tr -d '+'; echo '°') | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c htop"
+
+[module/sensors_cpu_yoga3]
+type = custom/script
+interval = 2
+format = 󰍛 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((top -bn1 | grep 'Cpu(s)' | sed 's/.*, *\([0-9.]*\)%* id.*/\1/' | awk -F '.' '{print 100 - $1}' ; echo '%, ' ; sensors | grep "Package id 0:" | awk -F' ' '{print $4}' | awk -F'.' '{print $1}' | tr -d '+'; echo '°') | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c htop"
+
+; Module Network Interfaces
+
+[module/wlan]
+type = internal/network
+interface = wlp2s0
+interval = 3
+format-connected = <label-connected>
+label-connected = %ifname%: %local_ip% [%essid%]
+
+[module/wlan_short]
+inherit="module/wlan"
+label-connected = %essid%
+
+[module/eth_pc]
+type = internal/network
+interface = enp5s0
+interval = 3
+format-connected = <label-connected>
+label-connected = 󰈀 %local_ip%
+
+[module/eth_yoga3]
+inherit="module/eth_pc"
+interface = enp0s31f6
+
+[module/usbmodem1]
+type = custom/script
+format = usb: <label>
+interval = 3
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u1
+
+[module/usbmodem2]
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u6
+
+[module/usbmodem3]
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u3
+
+[module/usbmodem4]
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh ens8u1u2
+
+; Module VPN
+
+[module/ovpn]
+type = custom/script
+interval = 3
+format = ovpn: <label>
+label-maxlen=50
+label-ellipsis=true
+exec = echo $(nmcli con show --active | grep vpn | cut -c1-12 | tr -d ' ')
+
+[module/nvpn]
+inherit="module/ovpn"
+format = nvpn: <label>
+exec = echo $(nordvpn status | grep -oP '(?<=Current server: ).*' | cut -f1 -d'.')
+
+; Module Volume + Media
+
+[module/volume]
+type = internal/pulseaudio
+master-mixer = IEC958
+mapped = true
+format-volume = <label-volume>
+label-volume =  %percentage%
+label-volume-foreground = ${root.foreground}
+format-muted-foreground = ${root.foreground}
+label-muted =  x
+interval = 1
+
+[module/playerctl]
+type = custom/script
+tail = true
+exec = ~/.config/polybar/scripts/modules/playerctl.sh
+click-left = "playerctl play-pause"
+click-right = "playerctl next"
+click-middle = "playerctl previous"
+
+[module/playerctl_long]
+inherit="module/playerctl"
+exec = bash ~/.config/polybar/scripts/modules/playerctl.sh 30
+
+[module/playerctl_buttons]
+type = custom/menu
+expand-right = true
+label-open = 
+label-close = 
+label-separator = "  "
+menu-0-0 = 
+menu-0-0-exec = "playerctl previous"
+menu-0-1 = 
+menu-0-1-exec = "playerctl play-pause"
+menu-0-2 = 
+menu-0-2-exec = "playerctl next"
+
+[module/pavucontrol_button]
+type = custom/text
+content = 󰕾 |
+click-left = "setsid pavucontrol"
+click-middle = "bash ~/Userdata/Scripts/Launchers/restart_pulseaudio_1s.sh"
+
+[module/cava]
+type = custom/script
+tail = true
+exec = python /home/sim/.config/polybar/scripts/modules/cava.py
+
+; Module Battery
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+poll-interval = 3
+adapter = ADP1
+full-at = 95
+label-full = bat: %percentage%%
+label-charging = bat: %percentage%% (+%consumption%W, %time%)
+label-discharging = bat: %percentage%% (-%consumption%W, %time%)
+
+[module/battery_short]
+inherit = "module/battery"
+label-full = bat: %percentage%%
+label-charging = bat: %percentage%%
+label-discharging = bat: %percentage%%
+
+; Module Disk
+
+[module/disk_short_pc]
+type = custom/script
+format = 󰆓 <label>
+interval = 10
+exec = echo $(df -h / | tail +2 | awk -F ' ' '{print $3 " / " $2 " (" $5 ")"}' | tr -d 'G')
+click-left = "setsid alacritty -e sh -c 'echo Disk overview... ; echo ; df -h -x tmpfs; echo ; read -p Done'"
+click-right = "setsid alacritty -e sh -c 'echo Scanning main disk ; echo ; ncdu --exclude /data / ; echo ; read -p Done!'"
+click-middle = "setsid alacritty -e sh -c 'echo Scanning full disk... ; echo ; sudo ncdu / ; echo ; read -p Done!'"
+
+[module/disk_short_pc_spacer]
+inherit = "module/disk_short_pc"
+format = | 󰆓 <label>
+
+[module/disk_short_yoga3]
+inherit = "module/disk_short_pc"
+exec = echo $(df -h / | tail +2 | awk -F ' ' '{print $3 " / " $2 " (" $5 ")"}' | tr -d 'G')
+
+; Module Backlight
+
+[module/xbacklight]
+type = internal/xbacklight
+format = <label>
+label = %percentage% 
+
+[module/xbacklight_buttons]
+type = custom/menu
+expand-right = true
+label-open = blght
+label-close = x
+label-separator = "  "
+menu-0-0 = -
+menu-0-0-exec = "xbacklight -dec 10; notify-send 'brightness down'"
+menu-0-1 = +
+menu-0-1-exec = "xbacklight -inc 10; notify-send 'brightness up'"
diff --git a/.config/polybar/config-merge/c04-config-modules-i3wm b/.config/polybar/config-merge/c04-config-modules-i3wm
new file mode 100644
index 0000000..2445bc5
--- /dev/null
+++ b/.config/polybar/config-merge/c04-config-modules-i3wm
@@ -0,0 +1,167 @@
+[global/wm]
+margin-top = 0
+margin-bottom = 0
+
+[module/i3]
+type = internal/i3
+pin-workspaces = true
+strip-wsnumbers = true
+index-sort = true
+enable-click = true
+enable-scroll = true
+wrapping-scroll = true
+reverse-scroll = true 
+fuzzy-match = false
+format = <label-state> <label-mode>
+label-mode = %mode%
+label-mode-padding = 1
+label-focused =%icon%%name%
+label-focused-foreground = ${colors.focused}
+label-focused-margin = 2
+label-unfocused =%icon%%name%
+label-unfocused-foreground = ${colors.unfocused}
+label-unfocused-margin = 1
+label-visible =%icon%%name%
+label-visible-margin = 1
+label-urgent =%icon%%name%
+label-urgent-foreground = ${colors.urgent}
+label-urgent-padding = 1
+
+[module/i3_dots]
+type = internal/i3
+ws-icon-default =" 󰀥 "
+pin-workspaces = true
+strip-wsnumbers = true
+index-sort = true
+enable-click = true
+enable-scroll = true
+wrapping-scroll = true
+reverse-scroll = true 
+fuzzy-match = false
+format =<label-state><label-mode>
+label-mode = %mode%
+label-focused =" 󰄯 " 
+label-focused-foreground = ${colors.foreground}
+label-unfocused =" 󰄰 " 
+label-unfocused-foreground = ${colors.foreground}
+label-visible =" 󰄯 " 
+label-urgent =" 󰀨 " 
+label-urgent-foreground = ${colors.foreground-alt}
+
+; Module Menus
+
+[module/i3touchmenu]
+type = custom/menu
+expand-right = true
+format-spacing = 1
+label-open = "| touch"
+label-open-foreground = #FFF
+label-close = "| x"
+label-separator = "'"
+; Menu Root 
+menu-0-0 = 
+menu-0-0-exec = menu-open-1
+menu-0-1 = 
+menu-0-1-exec = menu-open-2
+menu-0-2 = 
+menu-0-2-exec = menu-open-3
+menu-0-3 = 
+menu-0-3-exec = menu-open-4
+menu-0-4 = 
+menu-0-4-exec = menu-open-5
+menu-0-5 = 
+menu-0-5-exec = menu-open-6
+menu-0-6 = 
+menu-0-6-exec = menu-open-7
+menu-0-7 ="" 
+menu-0-7-exec = menu-open-8
+; Menu Category Launcher
+menu-1-0 = 
+menu-1-0-exec = menu-open-0
+menu-1-1="quick"
+menu-1-1-exec= setsid quicklaunch
+menu-1-2="xournal"
+menu-1-2-exec = "setsid xournalpp"
+menu-1-3="sync"
+menu-1-3-exec = "setsid python Sync/o_school/5AHEL/Notebooks/pdfconvert.py"
+menu-1-4=""
+menu-1-4-exec = urxvt &
+; Menu Category Window Movement
+menu-2-0 = 
+menu-2-0-exec = menu-open-0
+menu-2-1 = 
+menu-2-1-exec = i3-msg 'move left'
+menu-2-2 = 
+menu-2-2-exec = i3-msg 'move right'
+menu-2-3 = 
+menu-2-3-exec = i3-msg 'move up'
+menu-2-4 = ""
+menu-2-4-exec = i3-msg 'move down'
+menu-3-0 = 
+menu-3-0-exec = menu-open-0
+; Menu Category Layout
+menu-3-1 = split
+menu-3-1-exec = i3-msg 'layout toggle split'
+menu-3-2 = stack
+menu-3-2-exec = i3-msg 'layout stacking'
+menu-3-3 = tab  
+menu-3-3-exec = i3-msg 'layout tabbed'
+menu-3-4 = float
+menu-3-4-exec = i3-msg 'floating toggle'
+; Menu Category Split
+menu-4-0 = 
+menu-4-0-exec = menu-open-0
+menu-4-1 = vert
+menu-4-1-exec = i3-msg 'split v'
+menu-4-2 = horz
+menu-4-2-exec = i3-msg 'split h'
+; Menu Category Resize
+menu-5-0 = 
+menu-5-0-exec = menu-open-0
+menu-5-1 = h+
+menu-5-1-exec = i3-msg 'resize grow height 5 px or 5 ppt'
+menu-5-2 = h-
+menu-5-2-exec = i3-msg 'resize shrink height 5 px or 5 ppt'
+menu-5-3 = w+
+menu-5-3-exec = i3-msg 'resize grow width 5 px or 5 ppt'
+menu-5-4 = w-
+menu-5-4-exec = i3-msg 'resize shrink width 5 px or 5 ppt'
+; Menu Category Move
+menu-6-0 = 
+menu-6-0-exec = menu-open-0
+menu-6-1 = 1
+menu-6-1-exec = i3-msg 'move container to workspace 1'
+menu-6-2 = 2
+menu-6-2-exec = i3-msg 'move container to workspace 2'
+menu-6-3 = 3
+menu-6-3-exec = i3-msg 'move container to workspace 3'
+menu-6-4 = 4
+menu-6-4-exec = i3-msg 'move container to workspace 4'
+menu-6-5 = 5
+menu-6-5-exec = i3-msg 'move container to workspace 5'
+menu-6-6 = 6
+menu-6-6-exec = i3-msg 'move container to workspace 6'
+menu-6-7 = 7
+menu-6-7-exec = i3-msg 'move container to workspace 7'
+menu-6-8 = 8
+menu-6-8-exec = i3-msg 'move container to workspace 8'
+menu-6-9 = 9
+menu-6-9-exec = i3-msg 'move container to workspace 9'
+menu-6-10 = "10"
+menu-6-10-exec = i3-msg 'move container to workspace 10'
+; Menu Category Kill
+menu-7-0 = 
+menu-7-0-exec = menu-open-0
+menu-7-1 = "confirm"
+menu-7-1-exec = i3-msg 'kill'
+; Menu Category Powermenu
+menu-8-0 = 
+menu-8-0-exec = menu-open-0
+menu-8-1 = 
+menu-8-1-exec = xset dpms force off 
+menu-8-2 = 
+menu-8-2-exec = i3lock
+menu-8-3 = 
+menu-8-3-exec = shutdown -r now
+menu-8-4 = ""
+menu-8-4-exec = shutdown -h now
diff --git a/.config/polybar/config-merge/config-merge.sh b/.config/polybar/config-merge/config-merge.sh
new file mode 100644
index 0000000..0af120b
--- /dev/null
+++ b/.config/polybar/config-merge/config-merge.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+LOCATION="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
+
+OUTPUT_FILE="$1"
+INPUT_DIR="${2:-$LOCATION}"
+
+echo -n "Merging files in '$INPUT_DIR'"
+
+if [ -n "$OUTPUT_FILE" ]; then
+    echo " into '$OUTPUT_FILE'"
+    if [ -f "$OUTPUT_FILE" ]; then
+        mv "$OUTPUT_FILE" "$OUTPUT_FILE.bak"
+    fi
+fi
+
+find "$INPUT_DIR" -regextype sed -regex ".*c[0-9]*-.*" -print0 | sort -z |
+    while IFS= read -r -d '' filePath; do
+        file="${filePath:$((${#LOCATION} + 1))}"
+
+        if [ -z "$OUTPUT_FILE" ]; then
+            OUTPUT_FILE=$(echo "$file" | awk -F "[-]" '{print $2}')
+            echo " into '$OUTPUT_FILE'"
+            if [ -f "$OUTPUT_FILE" ]; then
+                mv "$OUTPUT_FILE" "$OUTPUT_FILE.bak"
+            fi
+        fi
+
+        if [ ! -f "$OUTPUT_FILE" ]; then
+            touch "$OUTPUT_FILE"
+        fi
+
+        cat "$INPUT_DIR/$file" >>"$OUTPUT_FILE"
+    done
diff --git a/.config/polybar/config.bak b/.config/polybar/config.bak
new file mode 100644
index 0000000..40281b7
--- /dev/null
+++ b/.config/polybar/config.bak
@@ -0,0 +1,486 @@
+;=====================================================;
+;                                                     ;
+;   To learn more about how to configure Polybar      ;
+;   go to https://github.com/jaagr/polybar            ;
+;                                                     ;
+;   The README contains alot of information           ;
+;                                                     ;
+;=====================================================;
+
+; Global Settings
+
+[settings]
+screenchange-reload = true
+
+[colors]
+transparent = #00ffffff
+background = ${xrdb:background}
+foreground = ${xrdb:foreground}
+foreground-alt = ${xrdb:highlight}
+
+border = ${xrdb:i3_focused}
+
+urgent = ${xrdb:i3_urgent}
+focused = ${xrdb:i3_focused}
+unfocused = ${xrdb:foreground}
+[bar/master]
+background = ${colors.background}
+foreground = ${colors.foreground}
+fixed-center = true
+font-0 = Hack Nerd Font:fontformat=truetype:pixelsize=10;1
+font-1 = Material Design Icons:fontformat=truetype:pixelsize=10:antialias=true;1
+line-size = 1
+module-margin-left = 1
+module-margin-right = 1
+monitor = ${env:MONITOR:DP-4}
+padding= 2
+separator =|
+
+
+[bar/border]
+inherit="bar/master"
+border-size=2
+border-color=${colors.border}
+radius = 15.0
+
+[bar/floating]
+inherit="bar/border"
+bottom = true
+enable-ipc = false
+height = 40px
+width = 60%
+;modules-center = cava clock playerctl_long
+modules-center = cava
+modules-left = floating_popup_button pavucontrol_button
+modules-right = sensors_cpu_pc nvgpu memory 
+monitor = ${env:MONITOR:DP-4}
+offset-x = 20%
+offset-y = 8px
+override-redirect = true
+tray-detached = true
+tray-maxsize = 15
+tray-offset-x=86
+tray-offset-y = 4px
+tray-padding = 3
+tray-position = left
+tray-scale = 0.8
+
+[bar/floating_popup]
+inherit="bar/border"
+bottom = true
+enable-ipc = true
+height = 40px
+width = 22%
+modules-left = disk_short_pc checkupdates ovpn nvpn eth_pc 
+offset-x = 20%
+offset-y = 58px
+
+[bar/floating_wm]
+inherit="bar/master"
+font-0 = dark forest:style=Bold:fontformat=truetype:pixelsize=10;4
+height = 15
+width = 100%
+modules-center = i3
+padding= 4
+override-redirect = true
+wm-restack = i3; Module popup
+
+[module/floating_popup_button]
+type = custom/script
+interval = 0.5
+format = <label>
+label-maxlen = 5
+exec = ~/.config/polybar/scripts/polypopup.sh
+click-left = ~/.config/polybar/scripts/polypopup.sh --toggle
+content = 󰋼
+
+; Module Date
+
+[module/clock]
+type = internal/date
+interval = 1
+date =
+date-alt =%d.%m.%Y
+time =" %H:%M"
+time-alt =%H:%M:%S,
+label =%time% %date% 
+
+[module/clock_icon]
+inherit = "module/clock"
+date = 󰥔
+
+; Module Updates
+
+[module/checkupdates]
+type = custom/script
+interval = 30
+format = 󰂪 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $(bash ~/.config/polybar/scripts/modules/update.sh --count-short)"
+click-left = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --list"
+click-right = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --update"
+click-middle = "setsid alacritty -e bash ~/.config/polybar/scripts/modules/update.sh --update-noconfirm"
+
+; Module HW-Statistics
+; For 'sensors_'-modules, run 'sensors-detect' from 'lm_sensors' first
+
+[module/memory]
+type = internal/memory
+interval = 2
+label = 󰆼 %percentage_used%%
+
+[module/nvgpu]
+type = custom/script
+interval = 2
+format = 󰹑 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((nvidia-smi -q | grep "Gpu" | awk -F':' '{print $2}' | tr -d ' '; echo ", "; nvidia-smi -q | grep "GPU Current Temp" | awk -F':' '{print $2}' | tr -d ' C' ; echo '°') | cat | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c nvtop"
+
+[module/sensors_cpu_pc]
+type = custom/script
+interval = 2
+format = 󰍛 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((top -bn1 | grep 'Cpu(s)' | sed 's/.*, *\([0-9.]*\)%* id.*/\1/' | awk -F '.' '{print 100 - $1}' ; echo '%, ' ; sensors | grep "CPUTIN" | awk -F' ' '{print $2}' | awk -F'.' '{print $1}' | tr -d '+'; echo '°') | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c htop"
+
+[module/sensors_cpu_yoga3]
+type = custom/script
+interval = 2
+format = 󰍛 <label>
+label-maxlen=15
+label-ellipsis=true
+exec = "echo $((top -bn1 | grep 'Cpu(s)' | sed 's/.*, *\([0-9.]*\)%* id.*/\1/' | awk -F '.' '{print 100 - $1}' ; echo '%, ' ; sensors | grep "Package id 0:" | awk -F' ' '{print $4}' | awk -F'.' '{print $1}' | tr -d '+'; echo '°') | tr -d '\n')"
+click-left = "setsid alacritty -e sh -c htop"
+
+; Module Network Interfaces
+
+[module/wlan]
+type = internal/network
+interface = wlp2s0
+interval = 3
+format-connected = <label-connected>
+label-connected = %ifname%: %local_ip% [%essid%]
+
+[module/wlan_short]
+inherit="module/wlan"
+label-connected = %essid%
+
+[module/eth_pc]
+type = internal/network
+interface = enp5s0
+interval = 3
+format-connected = <label-connected>
+label-connected = 󰈀 %local_ip%
+
+[module/eth_yoga3]
+inherit="module/eth_pc"
+interface = enp0s31f6
+
+[module/usbmodem1]
+type = custom/script
+format = usb: <label>
+interval = 3
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u1
+
+[module/usbmodem2]
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u6
+
+[module/usbmodem3]
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh enp0s20f0u3
+
+[module/usbmodem4]
+inherit="module/usbmodem1"
+exec = bash .config/polybar/scripts/modules/usbmodem.sh ens8u1u2
+
+; Module VPN
+
+[module/ovpn]
+type = custom/script
+interval = 3
+format = ovpn: <label>
+label-maxlen=50
+label-ellipsis=true
+exec = echo $(nmcli con show --active | grep vpn | cut -c1-12 | tr -d ' ')
+
+[module/nvpn]
+inherit="module/ovpn"
+format = nvpn: <label>
+exec = echo $(nordvpn status | grep -oP '(?<=Current server: ).*' | cut -f1 -d'.')
+
+; Module Volume + Media
+
+[module/volume]
+type = internal/pulseaudio
+master-mixer = IEC958
+mapped = true
+format-volume = <label-volume>
+label-volume =  %percentage%
+label-volume-foreground = ${root.foreground}
+format-muted-foreground = ${root.foreground}
+label-muted =  x
+interval = 1
+
+[module/playerctl]
+type = custom/script
+tail = true
+exec = ~/.config/polybar/scripts/modules/playerctl.sh
+click-left = "playerctl play-pause"
+click-right = "playerctl next"
+click-middle = "playerctl previous"
+
+[module/playerctl_long]
+inherit="module/playerctl"
+exec = bash ~/.config/polybar/scripts/modules/playerctl.sh 30
+
+[module/playerctl_buttons]
+type = custom/menu
+expand-right = true
+label-open = 
+label-close = 
+label-separator = "  "
+menu-0-0 = 
+menu-0-0-exec = "playerctl previous"
+menu-0-1 = 
+menu-0-1-exec = "playerctl play-pause"
+menu-0-2 = 
+menu-0-2-exec = "playerctl next"
+
+[module/pavucontrol_button]
+type = custom/text
+content = 󰕾 |
+click-left = "setsid pavucontrol"
+click-middle = "bash ~/Userdata/Scripts/Launchers/restart_pulseaudio_1s.sh"
+
+[module/cava]
+type = custom/script
+tail = true
+exec = python /home/sim/.config/polybar/scripts/modules/cava.py
+
+; Module Battery
+
+[module/battery]
+type = internal/battery
+battery = BAT0
+poll-interval = 3
+adapter = ADP1
+full-at = 95
+label-full = bat: %percentage%%
+label-charging = bat: %percentage%% (+%consumption%W, %time%)
+label-discharging = bat: %percentage%% (-%consumption%W, %time%)
+
+[module/battery_short]
+inherit = "module/battery"
+label-full = bat: %percentage%%
+label-charging = bat: %percentage%%
+label-discharging = bat: %percentage%%
+
+; Module Disk
+
+[module/disk_short_pc]
+type = custom/script
+format = 󰆓 <label>
+interval = 10
+exec = echo $(df -h / | tail +2 | awk -F ' ' '{print $3 " / " $2 " (" $5 ")"}' | tr -d 'G')
+click-left = "setsid alacritty -e sh -c 'echo Disk overview... ; echo ; df -h -x tmpfs; echo ; read -p Done'"
+click-right = "setsid alacritty -e sh -c 'echo Scanning main disk ; echo ; ncdu --exclude /data / ; echo ; read -p Done!'"
+click-middle = "setsid alacritty -e sh -c 'echo Scanning full disk... ; echo ; sudo ncdu / ; echo ; read -p Done!'"
+
+[module/disk_short_pc_spacer]
+inherit = "module/disk_short_pc"
+format = | 󰆓 <label>
+
+[module/disk_short_yoga3]
+inherit = "module/disk_short_pc"
+exec = echo $(df -h / | tail +2 | awk -F ' ' '{print $3 " / " $2 " (" $5 ")"}' | tr -d 'G')
+
+; Module Backlight
+
+[module/xbacklight]
+type = internal/xbacklight
+format = <label>
+label = %percentage% 
+
+[module/xbacklight_buttons]
+type = custom/menu
+expand-right = true
+label-open = blght
+label-close = x
+label-separator = "  "
+menu-0-0 = -
+menu-0-0-exec = "xbacklight -dec 10; notify-send 'brightness down'"
+menu-0-1 = +
+menu-0-1-exec = "xbacklight -inc 10; notify-send 'brightness up'"
+[global/wm]
+margin-top = 0
+margin-bottom = 0
+
+[module/i3]
+type = internal/i3
+pin-workspaces = true
+strip-wsnumbers = true
+index-sort = true
+enable-click = true
+enable-scroll = true
+wrapping-scroll = true
+reverse-scroll = true 
+fuzzy-match = false
+format = <label-state> <label-mode>
+label-mode = %mode%
+label-mode-padding = 1
+label-focused =%icon%%name%
+label-focused-foreground = ${colors.focused}
+label-focused-margin = 2
+label-unfocused =%icon%%name%
+label-unfocused-foreground = ${colors.unfocused}
+label-unfocused-margin = 1
+label-visible =%icon%%name%
+label-visible-margin = 1
+label-urgent =%icon%%name%
+label-urgent-foreground = ${colors.urgent}
+label-urgent-padding = 1
+
+[module/i3_dots]
+type = internal/i3
+ws-icon-default =" 󰀥 "
+pin-workspaces = true
+strip-wsnumbers = true
+index-sort = true
+enable-click = true
+enable-scroll = true
+wrapping-scroll = true
+reverse-scroll = true 
+fuzzy-match = false
+format =<label-state><label-mode>
+label-mode = %mode%
+label-focused =" 󰄯 " 
+label-focused-foreground = ${colors.foreground}
+label-unfocused =" 󰄰 " 
+label-unfocused-foreground = ${colors.foreground}
+label-visible =" 󰄯 " 
+label-urgent =" 󰀨 " 
+label-urgent-foreground = ${colors.foreground-alt}
+
+; Module Menus
+
+[module/i3touchmenu]
+type = custom/menu
+expand-right = true
+format-spacing = 1
+label-open = "| touch"
+label-open-foreground = #FFF
+label-close = "| x"
+label-separator = "'"
+; Menu Root 
+menu-0-0 = 
+menu-0-0-exec = menu-open-1
+menu-0-1 = 
+menu-0-1-exec = menu-open-2
+menu-0-2 = 
+menu-0-2-exec = menu-open-3
+menu-0-3 = 
+menu-0-3-exec = menu-open-4
+menu-0-4 = 
+menu-0-4-exec = menu-open-5
+menu-0-5 = 
+menu-0-5-exec = menu-open-6
+menu-0-6 = 
+menu-0-6-exec = menu-open-7
+menu-0-7 ="" 
+menu-0-7-exec = menu-open-8
+; Menu Category Launcher
+menu-1-0 = 
+menu-1-0-exec = menu-open-0
+menu-1-1="quick"
+menu-1-1-exec= setsid quicklaunch
+menu-1-2="xournal"
+menu-1-2-exec = "setsid xournalpp"
+menu-1-3="sync"
+menu-1-3-exec = "setsid python Sync/o_school/5AHEL/Notebooks/pdfconvert.py"
+menu-1-4=""
+menu-1-4-exec = urxvt &
+; Menu Category Window Movement
+menu-2-0 = 
+menu-2-0-exec = menu-open-0
+menu-2-1 = 
+menu-2-1-exec = i3-msg 'move left'
+menu-2-2 = 
+menu-2-2-exec = i3-msg 'move right'
+menu-2-3 = 
+menu-2-3-exec = i3-msg 'move up'
+menu-2-4 = ""
+menu-2-4-exec = i3-msg 'move down'
+menu-3-0 = 
+menu-3-0-exec = menu-open-0
+; Menu Category Layout
+menu-3-1 = split
+menu-3-1-exec = i3-msg 'layout toggle split'
+menu-3-2 = stack
+menu-3-2-exec = i3-msg 'layout stacking'
+menu-3-3 = tab  
+menu-3-3-exec = i3-msg 'layout tabbed'
+menu-3-4 = float
+menu-3-4-exec = i3-msg 'floating toggle'
+; Menu Category Split
+menu-4-0 = 
+menu-4-0-exec = menu-open-0
+menu-4-1 = vert
+menu-4-1-exec = i3-msg 'split v'
+menu-4-2 = horz
+menu-4-2-exec = i3-msg 'split h'
+; Menu Category Resize
+menu-5-0 = 
+menu-5-0-exec = menu-open-0
+menu-5-1 = h+
+menu-5-1-exec = i3-msg 'resize grow height 5 px or 5 ppt'
+menu-5-2 = h-
+menu-5-2-exec = i3-msg 'resize shrink height 5 px or 5 ppt'
+menu-5-3 = w+
+menu-5-3-exec = i3-msg 'resize grow width 5 px or 5 ppt'
+menu-5-4 = w-
+menu-5-4-exec = i3-msg 'resize shrink width 5 px or 5 ppt'
+; Menu Category Move
+menu-6-0 = 
+menu-6-0-exec = menu-open-0
+menu-6-1 = 1
+menu-6-1-exec = i3-msg 'move container to workspace 1'
+menu-6-2 = 2
+menu-6-2-exec = i3-msg 'move container to workspace 2'
+menu-6-3 = 3
+menu-6-3-exec = i3-msg 'move container to workspace 3'
+menu-6-4 = 4
+menu-6-4-exec = i3-msg 'move container to workspace 4'
+menu-6-5 = 5
+menu-6-5-exec = i3-msg 'move container to workspace 5'
+menu-6-6 = 6
+menu-6-6-exec = i3-msg 'move container to workspace 6'
+menu-6-7 = 7
+menu-6-7-exec = i3-msg 'move container to workspace 7'
+menu-6-8 = 8
+menu-6-8-exec = i3-msg 'move container to workspace 8'
+menu-6-9 = 9
+menu-6-9-exec = i3-msg 'move container to workspace 9'
+menu-6-10 = "10"
+menu-6-10-exec = i3-msg 'move container to workspace 10'
+; Menu Category Kill
+menu-7-0 = 
+menu-7-0-exec = menu-open-0
+menu-7-1 = "confirm"
+menu-7-1-exec = i3-msg 'kill'
+; Menu Category Powermenu
+menu-8-0 = 
+menu-8-0-exec = menu-open-0
+menu-8-1 = 
+menu-8-1-exec = xset dpms force off 
+menu-8-2 = 
+menu-8-2-exec = i3lock
+menu-8-3 = 
+menu-8-3-exec = shutdown -r now
+menu-8-4 = ""
+menu-8-4-exec = shutdown -h now
diff --git a/.config/polybar/launch_polybar.sh b/.config/polybar/launch_polybar.sh
deleted file mode 120000
index 1a572e0..0000000
--- a/.config/polybar/launch_polybar.sh
+++ /dev/null
@@ -1 +0,0 @@
-launch_polybar.sh##hostname.pc
\ No newline at end of file
diff --git a/.config/polybar/launch_polybar.sh##hostname.pc b/.config/polybar/launch_polybar.sh##hostname.pc
deleted file mode 100644
index 8f8e9b7..0000000
--- a/.config/polybar/launch_polybar.sh##hostname.pc
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -x polybar >/dev/null; do sleep 1; done
-
-# Launch
-polybar pc_primary_landscape -r &
-polybar pc_secondary_landscape -r &
-
-polybar pc_vnc_landscape -r &
-
-#insync
-echo "Bar launched..."
diff --git a/.config/polybar/launch_polybar.sh##hostname.yoga3 b/.config/polybar/launch_polybar.sh##hostname.yoga3
deleted file mode 100644
index 0a5a85b..0000000
--- a/.config/polybar/launch_polybar.sh##hostname.yoga3
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -x polybar >/dev/null; do sleep 1; done
-
-# Launch
-polybar yoga3_primary_landscape -r &
-
-echo "Bar launched..."
diff --git a/.config/polybar/launch_polybar_floating.sh b/.config/polybar/launch_polybar_floating.sh
index 76d588f..93e444a 100644
--- a/.config/polybar/launch_polybar_floating.sh
+++ b/.config/polybar/launch_polybar_floating.sh
@@ -18,13 +18,16 @@ killall -q polybar
 # Wait until the processes have been shut down
 while pgrep -x polybar >/dev/null; do sleep 1; done
 
+######################
+# Create config
+bash ~/.config/polybar/config-merge/config-merge.sh  ~/.config/polybar/config
 
 ######################
 # Launch polybar(s)
 #
 polybar floating -r -l warning &
 polybar floating_wm -r -l warning &
-polybar floating_sysinfo -r -l warning &
+polybar floating_popup -r -l warning &
 #
 #polybar pc_vnc_landscape -r -l warning &
 #
diff --git a/.config/polybar/launch_polybar_portrait.sh##hostname.yoga3 b/.config/polybar/launch_polybar_portrait.sh##hostname.yoga3
deleted file mode 100644
index 6000ab8..0000000
--- a/.config/polybar/launch_polybar_portrait.sh##hostname.yoga3
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -x polybar >/dev/null; do sleep 1; done
-
-# Launch
-polybar yoga3_primary_portrait -r &
-
-echo "Bar launched..."
diff --git a/.config/polybar/scripts/hideIt.sh b/.config/polybar/scripts/hideIt.sh
index 585d5c6..1385364 100755
--- a/.config/polybar/scripts/hideIt.sh
+++ b/.config/polybar/scripts/hideIt.sh
@@ -22,7 +22,7 @@ LOGS=0
 POPUPS_PIN=1
 
 # Statusfile Prefix
-STATUSFILE="$HOME/.config/polybar/scripts/.polypopup.floating_sysinfo"
+STATUSFILE="$HOME/.config/polybar/scripts/.polypopup.floating_popup"
 
 ######################
 
diff --git a/.config/polybar/scripts/modules/usbmodem.sh b/.config/polybar/scripts/modules/usbmodem.sh
new file mode 100644
index 0000000..fc01ce8
--- /dev/null
+++ b/.config/polybar/scripts/modules/usbmodem.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+ip -4 addr show "$1" 2>&1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}'
\ No newline at end of file
diff --git a/.config/polybar/scripts/polypopup.sh b/.config/polybar/scripts/polypopup.sh
index 32c6774..9b1421f 100755
--- a/.config/polybar/scripts/polypopup.sh
+++ b/.config/polybar/scripts/polypopup.sh
@@ -4,7 +4,7 @@
 ## Settings
 #
 # Name of the bar in polybar (e.g. [bar/BARNAME]) which should be used as popup
-POPUP_NAME="floating_sysinfo"
+POPUP_NAME="floating_popup"
 #
 # Set labels to indicate whether the corresponding popup is shown. These will appear in your main polybar
 POPUP_LABEL_ACTIVE="󰋽"