diff --git a/polybar/conf.d/mod_alsa b/polybar/conf.d/mod_alsa
new file mode 100644
index 0000000..a0628a7
--- /dev/null
+++ b/polybar/conf.d/mod_alsa
@@ -0,0 +1,23 @@
+[module/alsa]
+type = internal/alsa
+format-volume = <bar-volume>
+label-volume-foreground = ${root.foreground}
+format-muted-prefix = " "
+format-muted-foreground = ${colors.foreground-alt}
+label-muted = sound muted
+bar-volume-width = 10
+bar-volume-foreground-0 = #55aa55
+bar-volume-foreground-1 = #55aa55
+bar-volume-foreground-2 = #55aa55
+bar-volume-foreground-3 = #55aa55
+bar-volume-foreground-4 = #55aa55
+bar-volume-foreground-5 = #f5a70a
+bar-volume-foreground-6 = #ff5555
+bar-volume-gradient = false
+bar-volume-indicator = |
+bar-volume-indicator-font = 2
+bar-volume-fill = ─
+bar-volume-fill-font = 2
+bar-volume-empty = ─
+bar-volume-empty-font = 2
+bar-volume-empty-foreground = ${colors.foreground-alt}
diff --git a/polybar/conf.d/mod_backlight b/polybar/conf.d/mod_backlight
new file mode 100644
index 0000000..cc61dc1
--- /dev/null
+++ b/polybar/conf.d/mod_backlight
@@ -0,0 +1,6 @@
+[module/backlight]
+inherit = module/defaults
+exec = /usr/bin/brightnessctl get
+tail = true
+interval = 2
+format-prefix = "BRT "
diff --git a/polybar/conf.d/mod_battery b/polybar/conf.d/mod_battery
new file mode 100644
index 0000000..ab45049
--- /dev/null
+++ b/polybar/conf.d/mod_battery
@@ -0,0 +1,15 @@
+[module/battery]
+inherit = module/defaults
+type = internal/battery
+battery = BAT0
+adapter = AC
+full-at = 98
+label-charging =%percentage%% (CHG) // %consumption%W
+label-discharging =%percentage%% // %consumption%W
+label-full = FULL // %consumption%W
+format-charging-prefix = "PWR "
+format-charging-prefix-foreground =${colors.foreground-alt}
+format-discharging-prefix = "PWR "
+format-discharging-prefix-foreground =${colors.foreground-alt}
+format-full-prefix = "PWR "
+format-full-prefix-foreground =${colors.foreground-alt}
diff --git a/polybar/conf.d/mod_cpu b/polybar/conf.d/mod_cpu
new file mode 100644
index 0000000..a4f5e0f
--- /dev/null
+++ b/polybar/conf.d/mod_cpu
@@ -0,0 +1,11 @@
+[module/system-cpu-loadavg]
+inherit = module/defaults
+exec = /home/mg/dotfiles/polybar/scripte/system-cpu-loadavg.sh
+format-prefix = "LAVG "
+
+[module/cpu]
+type = internal/cpu
+interval = 5
+format-prefix = "CPU "
+format-prefix-foreground = ${colors.foreground-alt}
+label = %percentage:2%%
diff --git a/polybar/conf.d/mod_df b/polybar/conf.d/mod_df
new file mode 100644
index 0000000..d6e6be3
--- /dev/null
+++ b/polybar/conf.d/mod_df
@@ -0,0 +1,4 @@
+[module/df]
+inherit = module/defaults
+exec = /home/mg/dotfiles/polybar/scripte/df.sh
+format-prefix = "DU "
diff --git a/polybar/conf.d/mod_i3 b/polybar/conf.d/mod_i3
new file mode 100644
index 0000000..a51910f
--- /dev/null
+++ b/polybar/conf.d/mod_i3
@@ -0,0 +1,27 @@
+[module/i3]
+type = internal/i3
+format = <label-state> <label-mode>
+index-sort = true
+wrapping-scroll = false
+; Only show workspaces on the same output as the bar
+;pin-workspaces = true
+label-mode-padding = 2
+label-mode-foreground = #000
+label-mode-background = ${colors.primary}
+; focused = Active workspace on focused monitor
+label-focused = %index%
+label-focused-background = ${colors.background-alt}
+label-focused-underline= ${colors.primary}
+label-focused-padding = 2
+; unfocused = Inactive workspace on any monitor
+label-unfocused = %index%
+label-unfocused-padding = 2
+; visible = Active workspace on unfocused monitor
+label-visible = %index%
+label-visible-background = ${self.label-focused-background}
+label-visible-underline = ${self.label-focused-underline}
+label-visible-padding = ${self.label-focused-padding}
+; urgent = Workspace with urgency hint set
+label-urgent = %index%
+label-urgent-background = ${colors.alert}
+label-urgent-padding = 2
diff --git a/polybar/conf.d/mod_network b/polybar/conf.d/mod_network
new file mode 100644
index 0000000..81fde5b
--- /dev/null
+++ b/polybar/conf.d/mod_network
@@ -0,0 +1,31 @@
+[module/wlan]
+type = internal/network
+interface = wlp4s0
+interval = 5
+format-connected = <ramp-signal> <label-connected>
+label-connected = %essid%
+format-disconnected =
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
+ramp-signal-foreground = ${colors.foreground-alt}
+
+[module/eth_intern]
+type = internal/network
+interface = enp2s0
+interval = 5
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${colors.foreground-alt}
+label-connected = %local_ip%
+format-disconnected =
+
+[module/eth_dock]
+type = internal/network
+interface = enx482ae352c8d7
+interval = 5
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${colors.foreground-alt}
+label-connected = %local_ip%
+format-disconnected =
diff --git a/polybar/conf.d/mod_powermenu b/polybar/conf.d/mod_powermenu
new file mode 100644
index 0000000..2abeff4
--- /dev/null
+++ b/polybar/conf.d/mod_powermenu
@@ -0,0 +1,26 @@
+[module/powermenu]
+type = custom/menu
+expand-right = true
+format-spacing = 1
+label-open = 
+label-open-foreground = ${colors.secondary}
+label-close =  cancel
+label-close-foreground = ${colors.secondary}
+label-separator = |
+label-separator-foreground = ${colors.foreground-alt}
+menu-0-0 = reboot
+menu-0-0-exec = #powermenu.open.1
+menu-0-1 = power off
+menu-0-1-exec = #powermenu.open.2
+menu-0-2 = suspend
+menu-0-2-exec = #powermenu.open.3
+menu-0-3 = hibernate
+menu-0-3-exec = #powermenu.open.4
+menu-1-0 = reboot
+menu-1-0-exec = reboot
+menu-2-0 = power off
+menu-2-0-exec = poweroff
+menu-3-0 = suspend
+menu-3-0-exec = i3lock --ignore-empty-password --color 000000 && systemctl suspend
+menu-4-0 = hibernate
+menu-4-0-exec = i3lock --ignore-empty-password --color 000000 && systemctl hibernate
diff --git a/polybar/conf.d/mod_time b/polybar/conf.d/mod_time
new file mode 100644
index 0000000..5a8f692
--- /dev/null
+++ b/polybar/conf.d/mod_time
@@ -0,0 +1,4 @@
+[module/time]
+inherit = module/defaults
+exec = /home/mg/dotfiles/polybar/scripte/time.sh
+format-prefix = "DATE "
diff --git a/polybar/conf.d/modules b/polybar/conf.d/modules
index 5e0cd1b..8b13789 100644
--- a/polybar/conf.d/modules
+++ b/polybar/conf.d/modules
@@ -1,164 +1 @@
-[module/system-cpu-loadavg]
-inherit = module/defaults
-exec = /home/mg/dotfiles/polybar/scripte/system-cpu-loadavg.sh
-format-prefix = "LAVG "
 
-[module/time]
-inherit = module/defaults
-exec = /home/mg/dotfiles/polybar/scripte/time.sh
-format-prefix = "DATE "
-
-[module/df]
-inherit = module/defaults
-exec = /home/mg/dotfiles/polybar/scripte/df.sh
-format-prefix = "DU "
-
-[module/backlight]
-inherit = module/defaults
-exec = /usr/bin/brightnessctl get
-tail = true
-interval = 2
-format-prefix = "BRT "
-
-[module/i3]
-type = internal/i3
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-; Only show workspaces on the same output as the bar
-;pin-workspaces = true
-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
-; focused = Active workspace on focused monitor
-label-focused = %index%
-label-focused-background = ${colors.background-alt}
-label-focused-underline= ${colors.primary}
-label-focused-padding = 2
-; unfocused = Inactive workspace on any monitor
-label-unfocused = %index%
-label-unfocused-padding = 2
-; visible = Active workspace on unfocused monitor
-label-visible = %index%
-label-visible-background = ${self.label-focused-background}
-label-visible-underline = ${self.label-focused-underline}
-label-visible-padding = ${self.label-focused-padding}
-; urgent = Workspace with urgency hint set
-label-urgent = %index%
-label-urgent-background = ${colors.alert}
-label-urgent-padding = 2
-
-[module/cpu]
-type = internal/cpu
-interval = 5
-format-prefix = "CPU "
-format-prefix-foreground = ${colors.foreground-alt}
-label = %percentage:2%%
-
-[module/memory]
-type = internal/memory
-interval = 5
-format-prefix = "MEM "
-format-prefix-foreground = ${colors.foreground-alt}
-label = %percentage_used%%
-
-[module/wlan]
-type = internal/network
-interface = wlp4s0
-interval = 5
-format-connected = <ramp-signal> <label-connected>
-label-connected = %essid%
-format-disconnected =
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = ${colors.foreground-alt}
-
-[module/eth_intern]
-type = internal/network
-interface = enp2s0
-interval = 5
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
-format-disconnected =
-
-[module/eth_dock]
-type = internal/network
-interface = enx482ae352c8d7
-interval = 5
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
-format-disconnected =
-
-[module/alsa]
-type = internal/alsa
-format-volume = <bar-volume>
-label-volume-foreground = ${root.foreground}
-format-muted-prefix = " "
-format-muted-foreground = ${colors.foreground-alt}
-label-muted = sound muted
-bar-volume-width = 10
-bar-volume-foreground-0 = #55aa55
-bar-volume-foreground-1 = #55aa55
-bar-volume-foreground-2 = #55aa55
-bar-volume-foreground-3 = #55aa55
-bar-volume-foreground-4 = #55aa55
-bar-volume-foreground-5 = #f5a70a
-bar-volume-foreground-6 = #ff5555
-bar-volume-gradient = false
-bar-volume-indicator = |
-bar-volume-indicator-font = 2
-bar-volume-fill = ─
-bar-volume-fill-font = 2
-bar-volume-empty = ─
-bar-volume-empty-font = 2
-bar-volume-empty-foreground = ${colors.foreground-alt}
-
-[module/battery]
-inherit = module/defaults
-type = internal/battery
-battery = BAT0
-adapter = AC
-full-at = 98
-label-charging =%percentage%% (CHG) // %consumption%W
-label-discharging =%percentage%% // %consumption%W
-label-full = FULL // %consumption%W
-format-charging-prefix = "PWR " 
-format-charging-prefix-foreground =${colors.foreground-alt}
-format-discharging-prefix = "PWR " 
-format-discharging-prefix-foreground =${colors.foreground-alt}
-format-full-prefix = "PWR " 
-format-full-prefix-foreground =${colors.foreground-alt}
-
-
-
-[module/powermenu]
-type = custom/menu
-expand-right = true
-format-spacing = 1
-label-open = 
-label-open-foreground = ${colors.secondary}
-label-close =  cancel
-label-close-foreground = ${colors.secondary}
-label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-menu-0-0 = reboot
-menu-0-0-exec = #powermenu.open.1
-menu-0-1 = power off
-menu-0-1-exec = #powermenu.open.2
-menu-0-2 = suspend
-menu-0-2-exec = #powermenu.open.3
-menu-0-3 = hibernate
-menu-0-3-exec = #powermenu.open.4
-menu-1-0 = reboot
-menu-1-0-exec = reboot
-menu-2-0 = power off
-menu-2-0-exec = poweroff
-menu-3-0 = suspend
-menu-3-0-exec = i3lock --ignore-empty-password --color 000000 && systemctl suspend
-menu-4-0 = hibernate
-menu-4-0-exec = i3lock --ignore-empty-password --color 000000 && systemctl hibernate
diff --git a/polybar/conf.d/momd_mem b/polybar/conf.d/momd_mem
new file mode 100644
index 0000000..85836fd
--- /dev/null
+++ b/polybar/conf.d/momd_mem
@@ -0,0 +1,6 @@
+[module/memory]
+type = internal/memory
+interval = 5
+format-prefix = "MEM "
+format-prefix-foreground = ${colors.foreground-alt}
+label = %percentage_used%%