diff --git a/qpanels/config.ini b/qpanels/config.ini
index 0328d8f..48bc7b5 100644
--- a/qpanels/config.ini
+++ b/qpanels/config.ini
@@ -32,6 +32,10 @@ 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]
 ; Use either of the following command to list available outputs:
@@ -52,7 +56,7 @@ monitor-strict = false
 override-redirect = false
 
 ; Put the bar at the bottom of the screen
-bottom = false
+bottom = true
 
 ; Prefer fixed center position for the `modules-center` block
 ; When false, the center position will be based on the size of the other blocks.
@@ -62,7 +66,7 @@ fixed-center = true
 ; the percentage can optionally be extended with a pixel offset like so:
 ; 50%:-10, this will result in a width or height of 50% minus 10 pixels
 width = 100%
-height = 28
+height = 22
 
 ; Offset defined as pixel value (e.g. 35) or percentage (e.g. 50%)
 ; the percentage can optionally be extended with a pixel offset like so:
@@ -107,19 +111,19 @@ radius-bottom = 0.0
 ; the border is placed withing this area. So you effectively only have the
 ; following horizontal space on the bar:
 ;   width - border-right-size - border-left-size
-;;border-size = 2
-;;border-color = ${color.ac}
+border-size = 1
+border-color = ${color.bg}
 
 ; Number of spaces to add at the beginning/end of the bar
 ; Individual side values can be defined using:
 ;   padding-{left,right}
-padding = 3
+padding = 0
 
 ; Number of spaces to add before/after each module
 ; Individual side values can be defined using:
 ;   module-margin-{left,right}
-module-margin-left = 3
-module-margin-right = 3
+module-margin-left = 0
+module-margin-right = 1
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -131,24 +135,60 @@ module-margin-right = 3
 ;   font-3 = FontAwesome:size=10
 ; See the Fonts wiki page for more details
 
-font-0 = "Noto Sans:size=9:weight:bold;3"
-font-1 = "Iosevka Nerd Font:size=12;3"
+; 1111
+; Main font (clock, workspace num, volume bars)
+; also affects separator spacing (blanks get larger)
+; font-0 = "Noto Sans:size=9;4"
+; font-0 = "Iosevka Nerd Font:size=10;4"
+font-0 = "MesloLGS NF:size=9;3"
+; font-0 = "Hack Nerd Font:size=9;3"
+; font-0 = "JetBrains Mono Font:size=9;3"
 
+; 2222
+; Right icons (switch theme, wifi, battery)
+font-1 = "icomoon\\-feather:size=10;4"
+; font-1 = "MesloLGS NF:size=9;3"
 
+; 3333
+; Left icons like menu, terminal, firefox, folder, settings... (12)
+; font-2 = "Iosevka Nerd Font:size=14;3"
 font-2 = "MesloLGS NF:size=14;3"
+; font-2 = "Hack Nerd Font:size=14;3"
+; font-2 = "JetBrains Mono Font:size=14;3"
+; font-2 = "NotoSansMono Nerd Font:size=12;3"
+
+; 4444
+; ?? (8)
+; some things use font 4 like /batter module, label-discharging-font = 4 (starts on 1)
+; font-3 = "Noto Sans:size=8;4"
 font-3 = "MesloLGS NF:size=8;3"
+; font-3 = "Hack Nerd Font:size=8;3"
+; font-3 = "JetBrains Mono Nerd Font:size=8;3"
+
+; 5555
+; Even smaller for larger glips
+; Used for batter charging animation glyph
+; use x-font = 5
 font-4 = "MesloLGS NF:size=7;2"
 
 
+# forest for small volume
+# font-0 = "Iosevka Nerd Font:size=10;4"
+# font-1 = "Iosevka Nerd Font:size=10;3"
+# font-2 = "feather:size=12;3"
+
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ; Modules are added to one of the available blocks
 ;   modules-left = cpu ram
 ;   modules-center = xwindow xbacklight
 ;   modules-right = ipc clock
 
-modules-left = menu
-modules-center = date
-modules-right = i3 workspaces style alsa network battery settings powermenu
+modules-left = menu settings htop taskmanager bashtop files web web2 term editor notepad calc spotify
+; modules-center = memory cpu
+; alsa volume brightness title colorpicker
+modules-right = i3 cpu memory style workspaces volume_bar network battery date powermenu
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -254,6 +294,9 @@ cursor-scroll =
 ;;scroll-up = i3-msg workspace next_on_output
 ;;scroll-down = i3-msg workspace prev_on_output
 
+
+
+
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; Application Settings
@@ -298,7 +341,8 @@ compositing-border = over
 ; If set to true the bar can be transparent without a compositor.
 pseudo-transparency = false
 
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
+
 
 ;; ┌────────────────────────────────────────────────────────────┐
 ;; │░█▀█░█▀█░█░░░█░█░█▀▄░█▀█░█▀▄░░░░░░░░░█▀▀░█▀█░█░░░█▀█░█▀▄░█▀▀│
@@ -306,13 +350,13 @@ pseudo-transparency = false
 ;; │░▀░░░▀▀▀░▀▀▀░░▀░░▀▀░░▀░▀░▀░▀░░░░▀░░░░▀▀▀░▀▀▀░▀▀▀░▀▀▀░▀░▀░▀▀▀│
 ;; │░Created░By░Aditya░Shakya░@adi1090x░░░░░░░░░░░░░░░░░░░░░░░░░│
 ;; └────────────────────────────────────────────────────────────┘
-;;
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 [color]
 
 ;; Active Colors
-bg = #000000
+bg = #59000000
+bg-alt = #1A000000
+;;bg = #072919
 fg = #EAEAEA
 fg-alt = #9C9C9C
 
@@ -342,7 +386,8 @@ brown = #6d4c41
 grey = #757575
 blue-gray = #546e7a
 
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
+
 
 ;; ┌────────────────────────────────────────────────────────────────┐
 ;; │░█▀█░█▀█░█░░░█░█░█▀▄░█▀█░█▀▄░░░░░░░░░█▄█░█▀█░█▀▄░█░█░█░░░█▀▀░█▀▀│
@@ -350,243 +395,50 @@ blue-gray = #546e7a
 ;; │░▀░░░▀▀▀░▀▀▀░░▀░░▀▀░░▀░▀░▀░▀░░░░▀░░░░▀░▀░▀▀▀░▀▀░░▀▀▀░▀▀▀░▀▀▀░▀▀▀│
 ;; │░Created░By░Aditya░Shakya░@adi1090x░░░░░░░░░░░░░░░░░░░░░░░░░░░░░│
 ;; └────────────────────────────────────────────────────────────────┘
-;;
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 [module/menu]
 type = custom/text
-content = Applications
-;;content-background = ${color.bg}
-content-foreground = ${color.fg}
-;;content-padding = 4
-click-left = ~/.config/polybar/qpanels/scripts/launcher.sh --gnome
-click-right = ~/.config/polybar/qpanels/scripts/launcher.sh --gnome
+content = "%{T3}%{T-}"
+content-foreground = ${color.green}
+content-background = ${color.bg-alt}
+content-padding = 2
+click-left = ~/.config/polybar/qpanels/scripts/launcher.sh --deepin
+click-right = ~/.config/polybar/qpanels/scripts/launcher.sh --deepin
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 [module/powermenu]
 type = custom/text
+; content = 
+;content = "%{T3}%{T-}"
+;content = "%{T3}襤%{T-}"
 content = 襤
-;;content-background = ${color.bg}
+content-font = 3
 content-foreground = ${color.fg}
-;;content-padding = 4
-click-left = ~/.config/polybar/qpanels/scripts/powermenu.sh --gnome
-click-right = ~/.config/polybar/qpanels/scripts/powermenu.sh --gnome
+content-background = ${color.bg-alt}
+content-padding = 1
+click-left = ~/.config/polybar/qpanels/scripts/powermenu.sh --deepin
+click-right = ~/.config/polybar/qpanels/scripts/powermenu.sh --deepin
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 [module/style]
 type = custom/text
-#content = פֿ
-content = 
-click-left = ~/.config/polybar/qpanels/scripts/style-switch.sh --gnome
-click-right = ~/.config/polybar/qpanels/scripts/style-switch.sh --gnome
-
-;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-
-
-
-
-
-[module/alsa]
-type = internal/alsa
-
-; You can find the different card numbers in `/proc/asound/cards`
-;;master-soundcard = default
-;;speaker-soundcard = default
-;;headphone-soundcard = default
-
-; Default: Master
-;;master-mixer = Master
-
-; Optionally define speaker and headphone mixers
-; Default: none
-;;speaker-mixer = Speaker
-; Default: none
-;;headphone-mixer = Headphone
-
-; Default: 5
-;;interval = 5
-
-; Available tags:
-;   <label-volume> (default)
-;   <ramp-volume>
-;   <bar-volume>
-format-volume = <ramp-volume>
-
-; Available tags:
-;   <label-muted> (default)
-;   <ramp-volume>
-;   <bar-volume>
-;format-muted = <label-muted>
-
-; Available tokens:
-;   %percentage% (default)
-label-volume = %percentage%%
-
-; Available tokens:
-;   %percentage% (default
-label-muted = ﱝ
-label-muted-foreground = ${color.fg-alt}
-
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-2 = 
-ramp-volume-3 = 
-
-; ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-; [module/battery]
-; type = internal/battery
-
-; full-at = 99
-
-; ; $ ls -1 /sys/class/power_supply/
-; battery = BAT1
-; adapter = ACAD
-
-; poll-interval = 2
-; time-format = %H:%M
-
-; ; Available tags:
-; ;   <label-charging> (default)
-; ;   <bar-capacity>
-; ;   <ramp-capacity>
-; ;   <animation-charging>
-; format-charging = <animation-charging>
-
-; ; Available tags:
-; ;   <label-discharging> (default)
-; ;   <bar-capacity>
-; ;   <ramp-capacity>
-; ;   <animation-discharging>
-; format-discharging = <ramp-capacity>
-
-; ; Available tags:
-; ;   <label-full> (default)
-; ;   <bar-capacity>
-; ;   <ramp-capacity>
-; ;format-full = <ramp-capacity> <label-full>
-
-; ; Available tokens:
-; ;   %percentage% (default)
-; ;   %time%
-; ;   %consumption% (shows current charge rate in watts)
-; label-charging = %percentage%%
-
-; ; Available tokens:
-; ;   %percentage% (default)
-; ;   %time%
-; ;   %consumption% (shows current discharge rate in watts)
-; label-discharging = %percentage%%
-
-; ; Available tokens:
-; ;   %percentage% (default)
-; ;label-full = Fully Charged
-; label-full = 
-; label-full-foreground = ${color.green}
-
-; ramp-capacity-0 = 
-; ramp-capacity-1 = 
-; ramp-capacity-2 = 
-; ramp-capacity-3 = 
-; ramp-capacity-4 = 
-; ramp-capacity-5 = 
-; ramp-capacity-6 = 
-; ramp-capacity-7 = 
-; ramp-capacity-8 = 
-; ramp-capacity-9 = 
-
-; animation-charging-0 = 
-; animation-charging-1 = 
-; animation-charging-2 = 
-; animation-charging-3 = 
-; animation-charging-4 = 
-; animation-charging-5 = 
-; animation-charging-6 = 
-
-; ; Framerate in milliseconds
-; animation-charging-framerate = 750
-
-; ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-; [module/date]
-; type = internal/date
-
-; interval = 1.0
-
-; time = %a   %I:%M %p
-; time-alt = %B %d, %Y
-
-; format = <label>
-; label = %time%
-
-; ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
-
-; [module/network]
-; type = internal/network
-
-; interface = wlan0
-; interval = 1.0
-
-; ;ping-interval = 3
-; ;;udspeed-minwidth = 5
-; accumulate-stats = true
-; unknown-as-up = true
-
-; ; Available tags:
-; ;   <label-connected> (default)
-; ;   <ramp-signal>
-; format-connected = <label-connected>
-
-; ; Available tags:
-; ;   <label-disconnected> (default)
-; format-disconnected = <label-disconnected>
-
-; ; Available tags:
-; ;   <label-connected> (default)
-; ;   <label-packetloss>
-; ;   <animation-packetloss>
-; ;;format-packetloss = <animation-packetloss> <label-connected>
-
-; ; Available tokens:
-; ;   %ifname%    [wireless+wired]
-; ;   %local_ip%  [wireless+wired]
-; ;   %local_ip6% [wireless+wired]
-; ;   %essid%     [wireless]
-; ;   %signal%    [wireless]
-; ;   %upspeed%   [wireless+wired]
-; ;   %downspeed% [wireless+wired]
-; ;   %linkspeed% [wired]
-; ; Default: %ifname% %local_ip%
-; label-connected = "%{A1:networkmanager_dmenu &:}直%{A}"
-
-; ; Available tokens:
-; ;   %ifname%    [wireless+wired]
-; ; Default: (none)
-; label-disconnected = "%{A1:networkmanager_dmenu &:}睊%{A}"
-; label-disconnected-foreground = ${color.fg-alt}
-
-; ; Available tokens:
-; ;   %ifname%    [wireless+wired]
-; ;   %local_ip%  [wireless+wired]
-; ;   %local_ip6% [wireless+wired]
-; ;   %essid%     [wireless]
-; ;   %signal%    [wireless]
-; ;   %upspeed%   [wireless+wired]
-; ;   %downspeed% [wireless+wired]
-; ;   %linkspeed% [wired]
-; ; Default: (none)
-; ;label-packetloss = %essid%
-; ;label-packetloss-foreground = #eefafafa
-
-; ramp-signal-0 = 直
-; ramp-signal-1 = 直
-; ramp-signal-2 = 直
-; ramp-signal-3 = 直
-; ramp-signal-4 = 直
+; content = 
+; content = 
+; content = "%{T3}%{T-}"
+; content = "%{T3}%{T-}"
+; content = "%{T3}%{T-}"
+; content = "%{T3}%{T-}"
+; content = "%{T3}%{T-}"
+;content = "%{T3}%{T-} "
+;content = "%{T3}%{T-} "
+;content = 漣
+content = 頋
+content-font = 3
+content-padding = 1
+content-foreground = ${color.grey}
+click-left = ~/.config/polybar/qpanels/scripts/style-switch.sh --deepin
+click-right = ~/.config/polybar/qpanels/scripts/style-switch.sh --deepin
 
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
\ No newline at end of file
diff --git a/qpanels/panel/budgie.j2.ini b/qpanels/panel/budgie.j2.ini
index 9289607..d21c232 100644
--- a/qpanels/panel/budgie.j2.ini
+++ b/qpanels/panel/budgie.j2.ini
@@ -32,6 +32,10 @@ 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/deepin.ini b/qpanels/panel/deepin.ini
index 9d478cf..48bc7b5 100644
--- a/qpanels/panel/deepin.ini
+++ b/qpanels/panel/deepin.ini
@@ -32,6 +32,10 @@ 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]
 ; Use either of the following command to list available outputs:
@@ -184,7 +188,7 @@ font-4 = "MesloLGS NF:size=7;2"
 modules-left = menu settings htop taskmanager bashtop files web web2 term editor notepad calc spotify
 ; modules-center = memory cpu
 ; alsa volume brightness title colorpicker
-modules-right = i3 cpu memory style workspace_active volume_bar network battery date powermenu
+modules-right = i3 cpu memory style workspaces volume_bar network battery date powermenu
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
diff --git a/qpanels/panel/deepin.j2.ini b/qpanels/panel/deepin.j2.ini
index 6fd918b..6b4e316 100644
--- a/qpanels/panel/deepin.j2.ini
+++ b/qpanels/panel/deepin.j2.ini
@@ -32,6 +32,10 @@ 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/elementary.j2.ini b/qpanels/panel/elementary.j2.ini
index 6cea10a..7693acd 100644
--- a/qpanels/panel/elementary.j2.ini
+++ b/qpanels/panel/elementary.j2.ini
@@ -32,6 +32,10 @@ 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/elementary_dark.j2.ini b/qpanels/panel/elementary_dark.j2.ini
index d91f027..f1d90f7 100644
--- a/qpanels/panel/elementary_dark.j2.ini
+++ b/qpanels/panel/elementary_dark.j2.ini
@@ -27,6 +27,10 @@ include-file = ~/.config/polybar/shared/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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/gnome.j2.ini b/qpanels/panel/gnome.j2.ini
index 4d103a0..5901bab 100644
--- a/qpanels/panel/gnome.j2.ini
+++ b/qpanels/panel/gnome.j2.ini
@@ -32,6 +32,10 @@ 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/kde.j2.ini b/qpanels/panel/kde.j2.ini
index 76a1d87..edf1966 100644
--- a/qpanels/panel/kde.j2.ini
+++ b/qpanels/panel/kde.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/kde_dark.j2.ini b/qpanels/panel/kde_dark.j2.ini
index 237647d..d40f74c 100644
--- a/qpanels/panel/kde_dark.j2.ini
+++ b/qpanels/panel/kde_dark.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/liri.j2.ini b/qpanels/panel/liri.j2.ini
index b8c25cc..5e66889 100644
--- a/qpanels/panel/liri.j2.ini
+++ b/qpanels/panel/liri.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/mint.j2.ini b/qpanels/panel/mint.j2.ini
index 513eb73..7d0d238 100644
--- a/qpanels/panel/mint.j2.ini
+++ b/qpanels/panel/mint.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/ubuntu_gnome.j2.ini b/qpanels/panel/ubuntu_gnome.j2.ini
index 05330ee..725f554 100644
--- a/qpanels/panel/ubuntu_gnome.j2.ini
+++ b/qpanels/panel/ubuntu_gnome.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/ubuntu_unity.j2.ini b/qpanels/panel/ubuntu_unity.j2.ini
index 7205482..f2ffb96 100644
--- a/qpanels/panel/ubuntu_unity.j2.ini
+++ b/qpanels/panel/ubuntu_unity.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/xubuntu.j2.ini b/qpanels/panel/xubuntu.j2.ini
index 211eb96..d090022 100644
--- a/qpanels/panel/xubuntu.j2.ini
+++ b/qpanels/panel/xubuntu.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/qpanels/panel/zorin.j2.ini b/qpanels/panel/zorin.j2.ini
index a144132..ddb21cc 100644
--- a/qpanels/panel/zorin.j2.ini
+++ b/qpanels/panel/zorin.j2.ini
@@ -21,6 +21,10 @@ margin-top = 0
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
 ;; 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]
 ; Use either of the following command to list available outputs:
diff --git a/shared/bars.ini b/shared/bars.ini
index b151f9c..97b5ef8 100644
--- a/shared/bars.ini
+++ b/shared/bars.ini
@@ -187,7 +187,7 @@ type = internal/backlight
 ; $ ls -1 /sys/class/backlight/
 ;card = intel_backlight
 ;card = amdgpu_bl0
-card = None
+card = intel_backlight
 
 ; Available tags:
 ;   <label> (default)
diff --git a/shared/modules.ini b/shared/modules.ini
index ded36ce..04fc33d 100644
--- a/shared/modules.ini
+++ b/shared/modules.ini
@@ -51,7 +51,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.cyan}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = pcmanfm-qt &
+click-left  = nemo &
 
 [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  = lxqt-config &
+click-left  = cinnamon-settings &
 
 [module/htop]
 type = custom/text
@@ -83,7 +83,7 @@ content = "%{T3}%{T-}"
 content-foreground = ${color.green}
 content-background = ${color.bg}
 content-padding = 2
-click-left  = qps &
+click-left  = gnome-system-monitor &
 
 [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  = kate &
+click-left  = xed &
 
 [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  = galculator &
+click-left  = gnome-calculator &
 
 [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/ac-adaptive/scripts/launcher.sh --{}
-; click-right = /home/mreschke/Code/mreschke/polybar/ac-adaptive/scripts/launcher.sh --{}
+; click-left = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/launcher.sh --deepin
+; click-right = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/launcher.sh --deepin
 
 
 
@@ -157,7 +157,7 @@ click-left  = spotify &
 type = internal/battery
 
 ; $ ls -1 /sys/class/power_supply/
-battery = None
+battery = BAT0
 adapter = ACAD
 
 poll-interval = 2
@@ -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:xfce4-power-manager-settings:}%{A}"
-label-full = "%{A1:xfce4-power-manager-settings:}%{A}"
+;label-full = "%{A1:cinnamon-settings power:}%{A}"
+label-full = "%{A1:cinnamon-settings power:}%{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:xfce4-power-manager-settings:}%percentage%%%{A}"
+label-charging = "%{A1:cinnamon-settings power:}%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:xfce4-power-manager-settings:}%{A}"
+animation-charging-0 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-0-foreground = ${color.red}
 
-animation-charging-1 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-1 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-1-foreground = ${color.deep-orange}
 
-animation-charging-2 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-2 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-2-foreground = ${color.orange}
 
-animation-charging-3 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-3 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-3-foreground = ${color.amber}
 
-animation-charging-4 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-4 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-4-foreground = ${color.yellow}
 
-animation-charging-5 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-5 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-5-foreground = ${color.lime}
 
-animation-charging-6 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-6 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-6-foreground = ${color.light-green}
 
-animation-charging-7 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-7 = "%{A1:cinnamon-settings power:}%{A}"
 animation-charging-7-foreground = ${color.green}
 
-animation-charging-8 = "%{A1:xfce4-power-manager-settings:}%{A}"
+animation-charging-8 = "%{A1:cinnamon-settings power:}%{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:xfce4-power-manager-settings:}%percentage%%%{A}"
+label-discharging = "%{A1:cinnamon-settings power:}%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:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-0 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-0-foreground = ${color.white}
 ramp-capacity-0-background = ${color.pink}
 
 ; 11 - 20%
-ramp-capacity-1 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-1 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-1-foreground = ${color.red}
 
 ;21 - 30%
-ramp-capacity-2 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-2 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-2-foreground = ${color.deep-orange}
 
 ; 31 - 40%
-ramp-capacity-3 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-3 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-3-foreground = ${color.orange}
 
 ; 41 - 50%
-ramp-capacity-4 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-4 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-4-foreground = ${color.amber}
 
 ; 51 - 60%
-ramp-capacity-5 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-5 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-5-foreground = ${color.yellow}
 
 ; 61 - 70%
-ramp-capacity-6 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-6 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-6-foreground = ${color.lime}
 
 ; 71 - 80%
-ramp-capacity-7 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-7 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-7-foreground = ${color.light-green}
 
 ; 81 - 90-
-ramp-capacity-8 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-8 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-8-foreground = ${color.green}
 
 ; 91 - full
-ramp-capacity-9 = "%{A1:xfce4-power-manager-settings:}%{A}"
+ramp-capacity-9 = "%{A1:cinnamon-settings power:}%{A}"
 ramp-capacity-9-foreground = ${color.white}
 
 
@@ -463,7 +463,7 @@ label = " %mb_used%"
 [module/network]
 type = internal/network
 
-interface = enp6s18
+interface = wlp3s0
 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/ac-adaptive/scripts/powermenu.sh --{}
-;click-right = /home/mreschke/Code/mreschke/polybar/ac-adaptive/scripts/powermenu.sh --{}
+;click-left = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/powermenu.sh --deepin
+;click-right = /home/mreschke/Code/mreschke/polybar/qpanels/scripts/powermenu.sh --deepin
 
 
 
@@ -603,8 +603,8 @@ content-padding = 0
 ; ;content = "%{T3}%{T-} "
 ; content-padding = 1
 ; content-foreground = ${color.grey}
-; click-left = /home/mreschke/Code/mreschke/polybar/ac-adaptive/sripts/style-switch.sh --{}
-; click-right = /home/mreschke/Code/mreschke/polybar/ac-adaptive/sripts/style-switch.sh --{}
+; 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