diff --git a/ac-i3/config.ini b/ac-i3/config.ini
index 02d6d8b..6978523 100644
--- a/ac-i3/config.ini
+++ b/ac-i3/config.ini
@@ -17,8 +17,11 @@ include-file = ./modules.ini
 #include-file = ~/.config/polybar/shared/bars.ini
 
  
-
-
+;; Bar Settings
+[bar/primary]
+; This is for the primary monitor, the launch.sh script uses this bar for primary monitor only
+; the modules-right includes the tray for primary monitor only!
+inherit = bar/main
 
 [bar/main]
 monitor = ${env:MONITOR:}
diff --git a/shared/modules.ini b/shared/modules.ini
index 04fc33d..31fcaa4 100644
--- a/shared/modules.ini
+++ b/shared/modules.ini
@@ -27,7 +27,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.blue-gray}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = kitty &
+click-left  = konsole &
 
 [module/web]
 type = custom/text
@@ -51,7 +51,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.cyan}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = nemo &
+click-left  = dolphin &
 
 [module/settings]
 type = custom/text
@@ -59,7 +59,7 @@ type = custom/text
 content = "%{T3}%{T-}"
 content-foreground = ${color.fg-alt}
 content-padding = 2
-click-left  = cinnamon-settings &
+click-left  = systemsettings &
 
 [module/htop]
 type = custom/text
@@ -67,7 +67,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.orange}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = kitty -e htop &
+click-left  = konsole -e htop &
 
 [module/bashtop]
 type = custom/text
@@ -75,7 +75,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.orange}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = kitty -e bashtop &
+click-left  = konsole -e bashtop &
 
 [module/taskmanager]
 type = custom/text
@@ -83,7 +83,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.green}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = gnome-system-monitor &
+click-left  = ksysguard &
 
 [module/editor]
 type = custom/text
@@ -99,7 +99,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.light-blue}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = xed &
+click-left  = kate &
 
 [module/calc]
 type = custom/text
@@ -107,7 +107,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.amber}
 content-background = ${color.bg}
 content-padding = 1
-click-left  = gnome-calculator &
+click-left  = kcalc &
 
 [module/colorpicker]
 type = custom/text
@@ -142,8 +142,8 @@ click-left  = spotify &
 ; content-foreground = ${color.green}
 ; content-background = ${color.bg}
 ; content-padding = 2
-; click-left = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/launcher.sh --deepin
-; click-right = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/launcher.sh --deepin
+; click-left = /home/mreschke/Code/mreschke/polybar/ac-i3/scripts/launcher.sh --{}
+; click-right = /home/mreschke/Code/mreschke/polybar/ac-i3/scripts/launcher.sh --{}
 
 
 
@@ -176,8 +176,8 @@ full-at = 99
 ; This is a CLICK hack, since internal modules do not support click-left or click-right
 ; See https://github.com/polybar/polybar/issues/273#issuecomment-389150884
 ; See https://github.com/polybar/polybar/issues/1524
-;label-full = "%{A1:cinnamon-settings power:}%{A}"
-label-full = "%{A1:cinnamon-settings power:}%{A}"
+;label-full = "%{A1:xfce4-power-manager-settings:}%{A}"
+label-full = "%{A1:xfce4-power-manager-settings:}%{A}"
 label-full-foreground = ${color.green}
 label-full-padding-left = 0
 label-full-padding-right = 1
@@ -198,7 +198,7 @@ format-charging = <animation-charging> <label-charging>
 ;   %time%
 ;   %consumption% (shows current charge rate in watts)
 ;label-charging = %percentage%%
-label-charging = "%{A1:cinnamon-settings power:}%percentage%%%{A}"
+label-charging = "%{A1:xfce4-power-manager-settings:}%percentage%%%{A}"
 label-charging-font = 4
 label-charging-padding-left = 0
 label-charging-padding-right = 1
@@ -206,31 +206,31 @@ label-charging-padding-right = 1
 
 
 ; If using format-charing = <animation-charging>
-animation-charging-0 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-0 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-0-foreground = ${color.red}
 
-animation-charging-1 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-1 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-1-foreground = ${color.deep-orange}
 
-animation-charging-2 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-2 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-2-foreground = ${color.orange}
 
-animation-charging-3 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-3 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-3-foreground = ${color.amber}
 
-animation-charging-4 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-4 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-4-foreground = ${color.yellow}
 
-animation-charging-5 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-5 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-5-foreground = ${color.lime}
 
-animation-charging-6 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-6 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-6-foreground = ${color.light-green}
 
-animation-charging-7 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-7 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-7-foreground = ${color.green}
 
-animation-charging-8 = "%{A1:cinnamon-settings power:}%{A}"
+animation-charging-8 = "%{A1:xfce4-power-manager-settings:}%{A}"
 animation-charging-8-foreground = ${color.green}
 
 animation-charging-font = 3
@@ -251,7 +251,7 @@ format-discharging = <ramp-capacity> <label-discharging>
 ;   %time%
 ;   %consumption% (shows current discharge rate in watts)
 ;label-discharging = " %percentage%%"
-label-discharging = "%{A1:cinnamon-settings power:}%percentage%%%{A}"
+label-discharging = "%{A1:xfce4-power-manager-settings:}%percentage%%%{A}"
 label-discharging-font = 4
 label-discharging-padding-left = 0
 label-discharging-padding-right = 1
@@ -263,44 +263,44 @@ ramp-capacity-font = 4
 ramp-capacity-padding = 0
 
 ; 0 - 10%
-ramp-capacity-0 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-0 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-0-foreground = ${color.white}
 ramp-capacity-0-background = ${color.pink}
 
 ; 11 - 20%
-ramp-capacity-1 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-1 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-1-foreground = ${color.red}
 
 ;21 - 30%
-ramp-capacity-2 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-2 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-2-foreground = ${color.deep-orange}
 
 ; 31 - 40%
-ramp-capacity-3 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-3 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-3-foreground = ${color.orange}
 
 ; 41 - 50%
-ramp-capacity-4 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-4 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-4-foreground = ${color.amber}
 
 ; 51 - 60%
-ramp-capacity-5 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-5 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-5-foreground = ${color.yellow}
 
 ; 61 - 70%
-ramp-capacity-6 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-6 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-6-foreground = ${color.lime}
 
 ; 71 - 80%
-ramp-capacity-7 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-7 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-7-foreground = ${color.light-green}
 
 ; 81 - 90-
-ramp-capacity-8 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-8 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-8-foreground = ${color.green}
 
 ; 91 - full
-ramp-capacity-9 = "%{A1:cinnamon-settings power:}%{A}"
+ramp-capacity-9 = "%{A1:xfce4-power-manager-settings:}%{A}"
 ramp-capacity-9-foreground = ${color.white}
 
 
@@ -463,7 +463,7 @@ label = " %mb_used%"
 [module/network]
 type = internal/network
 
-interface = wlp3s0
+interface = wlp0s20f3
 interval = 1.0
 
 ;ping-interval = 3
@@ -555,8 +555,8 @@ click-right = nm-connection-editor &
 ;; content-background = ${color.bg-alt}
 ;content-foreground = ${color.fg}
 ;content-padding = 1
-;click-left = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/powermenu.sh --deepin
-;click-right = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/powermenu.sh --deepin
+;click-left = /home/mreschke/Code/mreschke/polybar/ac-i3/scripts/powermenu.sh --{}
+;click-right = /home/mreschke/Code/mreschke/polybar/ac-i3/scripts/powermenu.sh --{}
 
 
 
@@ -603,8 +603,8 @@ content-padding = 0
 ; ;content = "%{T3}%{T-} "
 ; content-padding = 1
 ; content-foreground = ${color.grey}
-; click-left = /home/mreschke/Code/mreschke/polybar/qpanels/sripts/style-switch.sh --deepin
-; click-right = /home/mreschke/Code/mreschke/polybar/qpanels/sripts/style-switch.sh --deepin
+; click-left = /home/mreschke/Code/mreschke/polybar/ac-i3/sripts/style-switch.sh --{}
+; click-right = /home/mreschke/Code/mreschke/polybar/ac-i3/sripts/style-switch.sh --{}