From 2f514fbc86291534d464bbf922d28baf31077f50 Mon Sep 17 00:00:00 2001
From: adi1090x <adi1090x@gmail.com>
Date: Mon, 4 Oct 2021 17:13:18 +0530
Subject: [PATCH] Updated

---
 PKGBUILD                                |   2 +-
 files/polybar/adaptive/config.ini       |   2 +-
 files/polybar/adaptive/launch.sh        |  25 +++--
 files/polybar/adaptive/modules.ini      |  61 ++++++++++--
 files/polybar/beach-bitmap/launch.sh    |  25 +++--
 files/polybar/beach-bitmap/modules.ini  |  37 +++++--
 files/polybar/beach/launch.sh           |  25 +++--
 files/polybar/beach/modules.ini         |  36 +++++--
 files/polybar/bouquet/config.ini        |   2 +-
 files/polybar/bouquet/launch.sh         |  25 +++--
 files/polybar/bouquet/modules.ini       |  62 ++++++++++--
 files/polybar/default/config.ini        |   2 +-
 files/polybar/default/launch.sh         |  25 +++--
 files/polybar/default/modules.ini       |  65 ++++++++++--
 files/polybar/eleven/launch.sh          |  25 +++--
 files/polybar/eleven/modules.ini        |  34 +++++--
 files/polybar/forest-bitmap/bars.ini    |   9 ++
 files/polybar/forest-bitmap/config.ini  |   2 +-
 files/polybar/forest-bitmap/launch.sh   |  25 +++--
 files/polybar/forest-bitmap/modules.ini |  52 ++++++++--
 files/polybar/forest/bars.ini           |   9 ++
 files/polybar/forest/config.ini         |   2 +-
 files/polybar/forest/launch.sh          |  25 +++--
 files/polybar/forest/modules.ini        |  52 ++++++++--
 files/polybar/hack/bars.ini             |   8 ++
 files/polybar/hack/config.ini           |   2 +-
 files/polybar/hack/launch.sh            |  25 +++--
 files/polybar/hack/modules.ini          | 127 ++++++++++++++++++++++--
 files/polybar/keyboards/config.ini      |   2 +-
 files/polybar/keyboards/launch.sh       |  25 +++--
 files/polybar/keyboards/modules.ini     |  64 ++++++++++--
 files/polybar/kiss/launch.sh            |  25 +++--
 files/polybar/kiss/modules.ini          |  41 ++++++--
 files/polybar/landscape/config.ini      |   2 +-
 files/polybar/landscape/launch.sh       |  25 +++--
 files/polybar/landscape/modules.ini     |  60 +++++++++--
 files/polybar/launch.sh                 |   6 +-
 files/polybar/manhattan/launch.sh       |  25 +++--
 files/polybar/manhattan/modules.ini     |  39 ++++++--
 files/polybar/mountain/launch.sh        |  25 +++--
 files/polybar/mountain/modules.ini      |  41 ++++++--
 files/polybar/nordic/config.ini         |   2 +-
 files/polybar/nordic/launch.sh          |  25 +++--
 files/polybar/nordic/modules.ini        |  61 ++++++++++--
 files/polybar/spark/launch.sh           |  25 +++--
 files/polybar/spark/modules.ini         |  37 +++++--
 files/polybar/tealize/config.ini        |   2 +-
 files/polybar/tealize/launch.sh         |  25 +++--
 files/polybar/tealize/modules.ini       |  60 +++++++++--
 files/polybar/wave/launch.sh            |  25 +++--
 files/polybar/wave/modules.ini          |  42 ++++++--
 51 files changed, 1181 insertions(+), 294 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index e4225ea..4d1eb8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=archcraft-openbox
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Openbox WM Configurations for Archcraft"
 url="https://github.com/archcraft-os/archcraft-openbox"
 arch=('any')
diff --git a/files/polybar/adaptive/config.ini b/files/polybar/adaptive/config.ini
index e6bfd5e..46af859 100644
--- a/files/polybar/adaptive/config.ini
+++ b/files/polybar/adaptive/config.ini
@@ -134,7 +134,7 @@ font-2 = "Iosevka Nerd Font:size=20;5"
 ;   modules-right = ipc clock
 
 # Default
-modules-left = sepL menu 1LD openbox 2LD cpu 3LD memory 4LD filesystem 5LD
+modules-left = sepL menu 1LD openbox 2LD cpu 3LD used-memory 4LD filesystem 5LD
 modules-center = mpd
 modules-right = 2RD volume 3RD backlight 4RD battery 5RD network 6RD date 7RD sysmenu sepR
 # Alternate
diff --git a/files/polybar/adaptive/launch.sh b/files/polybar/adaptive/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/adaptive/launch.sh
+++ b/files/polybar/adaptive/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/adaptive/modules.ini b/files/polybar/adaptive/modules.ini
index 380c3f6..25a3fb4 100644
--- a/files/polybar/adaptive/modules.ini
+++ b/files/polybar/adaptive/modules.ini
@@ -90,6 +90,17 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+content-background = ${color.BG2}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -449,6 +460,27 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BG2}
+
+format-prefix = ﬙
+format-prefix-font = 2
+format-prefix-foreground = ${color.BLUE}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -538,15 +570,32 @@ icon-next-foreground = ${color.CYAN}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.PURPLE}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG4}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG4}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/beach-bitmap/launch.sh b/files/polybar/beach-bitmap/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/beach-bitmap/launch.sh
+++ b/files/polybar/beach-bitmap/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/beach-bitmap/modules.ini b/files/polybar/beach-bitmap/modules.ini
index 262e769..b07c562 100644
--- a/files/polybar/beach-bitmap/modules.ini
+++ b/files/polybar/beach-bitmap/modules.ini
@@ -83,6 +83,15 @@ ramp-volume-foreground = ${color.PURPLE}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-foreground = ${color.RED}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -829,16 +838,30 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
-; Normal Module
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${color.LIME}
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = " "
+format-disconnected-prefix-foreground = ${color.RED}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/network]
 type = internal/network
 interface = ${system.network_interface}
diff --git a/files/polybar/beach/launch.sh b/files/polybar/beach/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/beach/launch.sh
+++ b/files/polybar/beach/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/beach/modules.ini b/files/polybar/beach/modules.ini
index f82d082..b96ddc3 100644
--- a/files/polybar/beach/modules.ini
+++ b/files/polybar/beach/modules.ini
@@ -83,6 +83,15 @@ ramp-volume-foreground = ${color.PURPLE}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-foreground = ${color.RED}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -827,15 +836,30 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.LIME}
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-foreground = ${color.RED}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/bouquet/config.ini b/files/polybar/bouquet/config.ini
index e7dcdd6..c249b78 100644
--- a/files/polybar/bouquet/config.ini
+++ b/files/polybar/bouquet/config.ini
@@ -133,7 +133,7 @@ font-2 = "Iosevka:style=bold:size=12;3"
 ;   modules-right = ipc clock
 
 # Default
-modules-left = menu sep openbox sep cpu sep memory sep filesystem
+modules-left = menu sep openbox sep cpu sep used-memory sep filesystem
 modules-center = mpd
 modules-right = volume sep backlight sep battery sep network sep date sep sysmenu
 # Alternate
diff --git a/files/polybar/bouquet/launch.sh b/files/polybar/bouquet/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/bouquet/launch.sh
+++ b/files/polybar/bouquet/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/bouquet/modules.ini b/files/polybar/bouquet/modules.ini
index 891b855..3b962a0 100644
--- a/files/polybar/bouquet/modules.ini
+++ b/files/polybar/bouquet/modules.ini
@@ -90,6 +90,16 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.AC}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -122,7 +132,7 @@ ramp-7 = 
 ramp-8 = 
 ramp-9 = 
 ramp-font = 2
-ramp-foreground = ${color.TEAL}
+ramp-foreground = ${color.AC}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -457,6 +467,27 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BG}
+
+format-prefix = ﭬ
+format-prefix-font = 2
+format-prefix-foreground = ${color.AC}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -552,15 +583,32 @@ icon-next-font = 2
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.AC}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/default/config.ini b/files/polybar/default/config.ini
index fd20fc7..caf7aec 100644
--- a/files/polybar/default/config.ini
+++ b/files/polybar/default/config.ini
@@ -141,7 +141,7 @@ font-4 = "Iosevka:style=bold:size=10;4"
 ;   modules-right = ipc clock
 
 # Default
-modules-left = LD menu RD dot-alt LD openbox RD dot cpu dot memory dot filesystem
+modules-left = LD menu RD dot-alt LD openbox RD dot cpu dot used-memory dot filesystem
 modules-center = LD date RD dot-alt LD mpd RD sep song
 modules-right = volume dot backlight dot network dot LD battery RD dot-alt LD sysmenu RD
 
diff --git a/files/polybar/default/launch.sh b/files/polybar/default/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/default/launch.sh
+++ b/files/polybar/default/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/default/modules.ini b/files/polybar/default/modules.ini
index 5767588..16ab7f0 100644
--- a/files/polybar/default/modules.ini
+++ b/files/polybar/default/modules.ini
@@ -90,6 +90,17 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+content-padding = 1
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -456,6 +467,28 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BG}
+format-padding = 1
+
+format-prefix = 
+format-prefix-font = 2
+format-prefix-foreground = ${color.CYAN}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -569,16 +602,34 @@ label-song-ellipsis = true
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
-; Normal Module
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.PURPLE}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+format-connected-padding = 1
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+format-disconnected-padding = 1
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/network]
 type = internal/network
 interface = ${system.network_interface}
diff --git a/files/polybar/eleven/launch.sh b/files/polybar/eleven/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/eleven/launch.sh
+++ b/files/polybar/eleven/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/eleven/modules.ini b/files/polybar/eleven/modules.ini
index 064359a..0fc86ed 100644
--- a/files/polybar/eleven/modules.ini
+++ b/files/polybar/eleven/modules.ini
@@ -90,6 +90,17 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.FG}
+content-padding = 0
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -122,7 +133,7 @@ ramp-7 = 
 ramp-8 = 
 ramp-9 = 
 ramp-font = 2
-ramp-foreground = ${color.TEAL}
+ramp-foreground = ${color.FG}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -160,7 +171,7 @@ ramp-7 = 
 ramp-8 = 
 ramp-9 = 
 ramp-font = 2
-ramp-foreground = ${color.AC}
+ramp-foreground = ${color.FG}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -550,15 +561,22 @@ icon-next-foreground = ${color.AC}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-disconnected = <label-disconnected>
+
+label-connected = "%{A1:networkmanager_dmenu &:}泌%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}%{A}"
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/forest-bitmap/bars.ini b/files/polybar/forest-bitmap/bars.ini
index 34b57da..c5b8b4a 100644
--- a/files/polybar/forest-bitmap/bars.ini
+++ b/files/polybar/forest-bitmap/bars.ini
@@ -68,6 +68,15 @@ bar-volume-empty-font = 1
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna-bar]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-foreground = ${color.FG}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight-bar]
 type = internal/xbacklight
 
diff --git a/files/polybar/forest-bitmap/config.ini b/files/polybar/forest-bitmap/config.ini
index 6fb924b..5625fb1 100644
--- a/files/polybar/forest-bitmap/config.ini
+++ b/files/polybar/forest-bitmap/config.ini
@@ -151,7 +151,7 @@ font-1 = "waffle:size=12;2"
 ;cpu_bar memory_bar filesystem_bar mpd_bar 
 ;volume brightness battery_bar 
 
-modules-left = openbox sep2 cpu memory filesystem
+modules-left = openbox sep2 cpu used-memory filesystem
 modules-center = mpd sep date
 modules-right = battery network sep volume backlight-bar
 
diff --git a/files/polybar/forest-bitmap/launch.sh b/files/polybar/forest-bitmap/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/forest-bitmap/launch.sh
+++ b/files/polybar/forest-bitmap/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/forest-bitmap/modules.ini b/files/polybar/forest-bitmap/modules.ini
index 1d4dd69..cd9ecaf 100644
--- a/files/polybar/forest-bitmap/modules.ini
+++ b/files/polybar/forest-bitmap/modules.ini
@@ -83,6 +83,15 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-foreground = ${color.TEAL}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -721,6 +730,24 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-prefix = 
+format-prefix-foreground = ${color.BLUE}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -818,15 +845,28 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = " "
+format-connected-prefix-foreground = ${color.PURPLE}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = " "
+format-disconnected-prefix-foreground = ${color.RED}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/forest/bars.ini b/files/polybar/forest/bars.ini
index d713c37..a4076f0 100644
--- a/files/polybar/forest/bars.ini
+++ b/files/polybar/forest/bars.ini
@@ -73,6 +73,15 @@ bar-volume-empty-font = 2
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna-bar]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-foreground = ${color.FG}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight-bar]
 type = internal/xbacklight
 
diff --git a/files/polybar/forest/config.ini b/files/polybar/forest/config.ini
index 1b3d116..df23f39 100644
--- a/files/polybar/forest/config.ini
+++ b/files/polybar/forest/config.ini
@@ -151,7 +151,7 @@ font-1 = "waffle:size=12;2"
 ;cpu_bar memory_bar filesystem_bar mpd_bar 
 ;volume brightness battery_bar 
 
-modules-left = openbox sep2 cpu memory filesystem
+modules-left = openbox sep2 cpu used-memory filesystem
 modules-center = mpd sep date
 modules-right = battery network sep volume backlight-bar
 
diff --git a/files/polybar/forest/launch.sh b/files/polybar/forest/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/forest/launch.sh
+++ b/files/polybar/forest/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/forest/modules.ini b/files/polybar/forest/modules.ini
index 5be9da6..a33203f 100644
--- a/files/polybar/forest/modules.ini
+++ b/files/polybar/forest/modules.ini
@@ -88,6 +88,15 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-foreground = ${color.TEAL}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -735,6 +744,24 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-prefix = 
+format-prefix-foreground = ${color.BLUE}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -832,15 +859,28 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.PURPLE}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-foreground = ${color.RED}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/hack/bars.ini b/files/polybar/hack/bars.ini
index 77f0cf3..e2ca865 100644
--- a/files/polybar/hack/bars.ini
+++ b/files/polybar/hack/bars.ini
@@ -102,6 +102,14 @@ ramp-headphones-0 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna-bar]
+type = custom/text
+
+content = " NA"
+content-prefix = 盛
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight-bar]
 type = internal/xbacklight
 
diff --git a/files/polybar/hack/config.ini b/files/polybar/hack/config.ini
index 92dfe6a..6e4f432 100644
--- a/files/polybar/hack/config.ini
+++ b/files/polybar/hack/config.ini
@@ -144,7 +144,7 @@ font-1 = "Iosevka Nerd Font:pixelsize=12;4"
 inherit = bar/main
 border-bottom-size = 1
 border-bottom-color = ${color.primary}
-modules-left = menu sep cpu sep memory sep filesystem
+modules-left = menu sep cpu sep used-memory sep filesystem
 modules-center = workspaces
 modules-right = updates sep checknet sep battery sep date sep sysmenu
 enable-ipc = true
diff --git a/files/polybar/hack/launch.sh b/files/polybar/hack/launch.sh
index b3e35c7..874b52a 100755
--- a/files/polybar/hack/launch.sh
+++ b/files/polybar/hack/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -31,5 +35,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/hack/modules.ini b/files/polybar/hack/modules.ini
index da4635e..2e35476 100644
--- a/files/polybar/hack/modules.ini
+++ b/files/polybar/hack/modules.ini
@@ -78,6 +78,14 @@ ramp-headphones-0 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 盛
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -657,6 +665,23 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-prefix = 
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -750,15 +775,6 @@ toggle-off-foreground = ${color.red}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
-type = internal/network
-interface = ${system.network_interface}
-
 ; Normal Module
 [module/network]
 type = internal/network
@@ -947,6 +963,99 @@ ramp-signal-4 =
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/ethernet_ext]
+type = internal/network
+interface = ${system.network_interface}
+
+; Seconds to sleep between updates
+; Default: 1
+interval = 1.0
+
+; Test connectivity every Nth update
+; A value of 0 disables the feature
+; NOTE: Experimental (needs more testing)
+; Default: 0
+;ping-interval = 3
+
+; @deprecated: Define min width using token specifiers (%downspeed:min% and %upspeed:min%)
+; Minimum output width of upload/download rate
+; Default: 3
+;;udspeed-minwidth = 5
+
+; Accumulate values from all interfaces
+; when querying for up/downspeed rate
+; Default: false
+accumulate-stats = true
+
+; Consider an `UNKNOWN` interface state as up.
+; Some devices have an unknown state, even when they're running
+; Default: false
+unknown-as-up = true
+
+; Available tags:
+;   <label-connected> (default)
+;   <ramp-signal>
+format-connected = <label-connected>
+format-connected-prefix = 泌
+; Available tags:
+;   <label-disconnected> (default)
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = 戀
+
+; 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 &:} %ifname% ∙ 歷 %local_ip% ∙  %downspeed% ∙ 祝 %upspeed%%{A}"
+
+; Available tokens:
+;   %ifname%    [wireless+wired]
+; Default: (none)
+label-disconnected = "%{A1:networkmanager_dmenu &:} Disconnected%{A}"
+;;label-disconnected-foreground = #66ffffff
+
+; 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
+
+; Only applies if <ramp-signal> is used
+ramp-signal-0 = 
+ramp-signal-1 = 
+ramp-signal-2 = 
+ramp-signal-3 = 
+ramp-signal-4 = 
+
+; Only applies if <animation-packetloss> is used
+;;animation-packetloss-0 = ⚠
+;;animation-packetloss-0-foreground = #ffa64c
+;;animation-packetloss-1 = ⚠
+;;animation-packetloss-1-foreground = #000000
+; Framerate in milliseconds
+;;animation-packetloss-framerate = 500
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/pulseaudio]
 type = internal/pulseaudio
 
diff --git a/files/polybar/keyboards/config.ini b/files/polybar/keyboards/config.ini
index e50f8fa..df10471 100644
--- a/files/polybar/keyboards/config.ini
+++ b/files/polybar/keyboards/config.ini
@@ -135,7 +135,7 @@ font-2 = "Iosevka Nerd Font:size=20;5"
 
 # Default
 modules-left = menu 3LD openbox 2LD mpd 1LD 
-modules-center = cpu sep memory sep filesystem
+modules-center = cpu sep used-memory sep filesystem
 modules-right = 1RD volume 2RD backlight 3RD battery 4RD network 5RD date 6RD sysmenu
 
 # Alternate
diff --git a/files/polybar/keyboards/launch.sh b/files/polybar/keyboards/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/keyboards/launch.sh
+++ b/files/polybar/keyboards/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/keyboards/modules.ini b/files/polybar/keyboards/modules.ini
index cf84471..a5aa267 100644
--- a/files/polybar/keyboards/modules.ini
+++ b/files/polybar/keyboards/modules.ini
@@ -90,6 +90,18 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+content-background = ${color.BG2}
+content-padding = 1
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -456,6 +468,27 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BG}
+
+format-prefix = ﲮ
+format-prefix-font = 2
+format-prefix-foreground = ${color.BLUE}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -552,15 +585,34 @@ icon-next-foreground = ${color.CYAN}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.PURPLE}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG4}
+format-connected-padding = 1
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG4}
+format-disconnected-padding = 1
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/kiss/launch.sh b/files/polybar/kiss/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/kiss/launch.sh
+++ b/files/polybar/kiss/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/kiss/modules.ini b/files/polybar/kiss/modules.ini
index 803fc5d..8ea1db3 100644
--- a/files/polybar/kiss/modules.ini
+++ b/files/polybar/kiss/modules.ini
@@ -90,6 +90,16 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.AC}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -122,7 +132,7 @@ ramp-7 = 
 ramp-8 = 
 ramp-9 = 
 ramp-font = 2
-ramp-foreground = ${color.TEAL}
+ramp-foreground = ${color.AC}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -551,15 +561,32 @@ icon-next-foreground = ${color.AC}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.AC}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/landscape/config.ini b/files/polybar/landscape/config.ini
index b1af506..c4ce9b9 100644
--- a/files/polybar/landscape/config.ini
+++ b/files/polybar/landscape/config.ini
@@ -133,7 +133,7 @@ font-2 = "Iosevka:style=bold:size=12;3"
 ;   modules-right = ipc clock
 
 # Default
-modules-left = menu sep openbox sep cpu sep memory sep filesystem
+modules-left = menu sep openbox sep cpu sep used-memory sep filesystem
 modules-center = mpd
 modules-right = volume sep backlight sep battery sep network sep date sep sysmenu
 # Alternate
diff --git a/files/polybar/landscape/launch.sh b/files/polybar/landscape/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/landscape/launch.sh
+++ b/files/polybar/landscape/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/landscape/modules.ini b/files/polybar/landscape/modules.ini
index 6956993..3567ee2 100644
--- a/files/polybar/landscape/modules.ini
+++ b/files/polybar/landscape/modules.ini
@@ -90,6 +90,16 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -457,6 +467,27 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BG}
+
+format-prefix = ﭬ
+format-prefix-font = 2
+format-prefix-foreground = ${color.ORANGE}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -551,15 +582,32 @@ icon-next-foreground = ${color.BLUE}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.YELLOW}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/launch.sh b/files/polybar/launch.sh
index 9c7cb38..50c0451 100755
--- a/files/polybar/launch.sh
+++ b/files/polybar/launch.sh
@@ -10,9 +10,9 @@ RFILE="$DIR/.system"
 
 ## Get system variable values for various modules
 get_values() {
-	CARD=$(ls /sys/class/backlight | head -n 1)
-	BATTERY=$(ls /sys/class/power_supply | grep BAT | head -n 1)
-	ADAPTER=$(ls /sys/class/power_supply | grep AC | head -n 1)
+	CARD=$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)
+	BATTERY=$(upower -i `upower -e | grep 'BAT'` | grep 'native-path' | cut -d':' -f2 | tr -d '[:blank:]')
+	ADAPTER=$(upower -i `upower -e | grep 'AC'` | grep 'native-path' | cut -d':' -f2 | tr -d '[:blank:]')
 	INTERFACE=$(ip link | awk '/state UP/ {print $2}' | tr -d :)
 }
 
diff --git a/files/polybar/manhattan/launch.sh b/files/polybar/manhattan/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/manhattan/launch.sh
+++ b/files/polybar/manhattan/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/manhattan/modules.ini b/files/polybar/manhattan/modules.ini
index 5b5cdfe..c279cb0 100644
--- a/files/polybar/manhattan/modules.ini
+++ b/files/polybar/manhattan/modules.ini
@@ -52,6 +52,16 @@ ramp-volume-font = 2
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -366,15 +376,32 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.PURPLE}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-prefix-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/mountain/launch.sh b/files/polybar/mountain/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/mountain/launch.sh
+++ b/files/polybar/mountain/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/mountain/modules.ini b/files/polybar/mountain/modules.ini
index ac0cd30..edc2779 100644
--- a/files/polybar/mountain/modules.ini
+++ b/files/polybar/mountain/modules.ini
@@ -90,6 +90,16 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.AC}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -122,7 +132,7 @@ ramp-7 = 
 ramp-8 = 
 ramp-9 = 
 ramp-font = 2
-ramp-foreground = ${color.TEAL}
+ramp-foreground = ${color.AC}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
@@ -551,15 +561,32 @@ icon-next-foreground = ${color.AC}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.AC}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/nordic/config.ini b/files/polybar/nordic/config.ini
index 693d530..951ef01 100644
--- a/files/polybar/nordic/config.ini
+++ b/files/polybar/nordic/config.ini
@@ -134,7 +134,7 @@ font-2 = "Iosevka Nerd Font:size=15;4"
 ;   modules-right = ipc clock
 
 # Default
-modules-left = LD menu RD sep LD cpu RD sep LD memory RD sep LD filesystem RD sep LD mpd RD sep song
+modules-left = LD menu RD sep LD cpu RD sep LD used-memory RD sep LD filesystem RD sep LD mpd RD sep song
 modules-center = LD title RD dot LD openbox RD
 modules-right = LD volume RD sep LD backlight RD sep LD battery RD sep LD network RD sep LD date RD sep LD sysmenu RD
 
diff --git a/files/polybar/nordic/launch.sh b/files/polybar/nordic/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/nordic/launch.sh
+++ b/files/polybar/nordic/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/nordic/modules.ini b/files/polybar/nordic/modules.ini
index ee7ee54..16f5503 100644
--- a/files/polybar/nordic/modules.ini
+++ b/files/polybar/nordic/modules.ini
@@ -90,6 +90,17 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+content-background = ${color.BGL}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -449,6 +460,27 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BGL}
+
+format-prefix = 
+format-prefix-font = 2
+format-prefix-foreground = ${color.BLUE}
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -558,15 +590,32 @@ label-song-ellipsis = true
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.PURPLE}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BGL}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BGL}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/spark/launch.sh b/files/polybar/spark/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/spark/launch.sh
+++ b/files/polybar/spark/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/spark/modules.ini b/files/polybar/spark/modules.ini
index fd790d5..41a3df3 100644
--- a/files/polybar/spark/modules.ini
+++ b/files/polybar/spark/modules.ini
@@ -59,6 +59,16 @@ ramp-volume-font = 2
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -372,15 +382,30 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.YELLOW}
+format-connected-prefix-font = 2
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-prefix-foreground = ${color.FG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/tealize/config.ini b/files/polybar/tealize/config.ini
index e8d299e..03ac41f 100644
--- a/files/polybar/tealize/config.ini
+++ b/files/polybar/tealize/config.ini
@@ -133,7 +133,7 @@ font-2 = "Iosevka:style=bold:size=12;3"
 ;   modules-right = ipc clock
 
 # Default
-modules-left = menu sep openbox sep cpu sep memory sep filesystem
+modules-left = menu sep openbox sep cpu sep used-memory sep filesystem
 modules-center = mpd
 modules-right = volume sep backlight sep battery sep network sep date sep sysmenu
 # Alternate
diff --git a/files/polybar/tealize/launch.sh b/files/polybar/tealize/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/tealize/launch.sh
+++ b/files/polybar/tealize/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/tealize/modules.ini b/files/polybar/tealize/modules.ini
index 43077f6..0042a45 100644
--- a/files/polybar/tealize/modules.ini
+++ b/files/polybar/tealize/modules.ini
@@ -90,6 +90,16 @@ ramp-headphones-1 = 
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-foreground = ${color.CYAN}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -466,6 +476,27 @@ label = " %mb_used%"
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/used-memory]
+type = custom/script
+
+exec = free -m | sed -n 's/^Mem:\s\+[0-9]\+\s\+\([0-9]\+\)\s.\+/\1/p'
+
+tail = true
+interval = 5
+
+format = <label>
+format-background = ${color.BG}
+format-foreground = ${color.PINK}
+
+format-prefix = 
+format-prefix-font = 2
+
+label = " %output% MB"
+
+click-left = alacritty -e "top" &
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/mpd]
 type = internal/mpd
 
@@ -561,15 +592,32 @@ icon-next-foreground = ${color.CYAN}
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = eth0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG}
+format-connected-foreground = ${color.GREEN}
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-foreground = ${color.BGA}
+format-disconnected-background = ${color.BG}
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network
diff --git a/files/polybar/wave/launch.sh b/files/polybar/wave/launch.sh
index 9971e80..d294d16 100755
--- a/files/polybar/wave/launch.sh
+++ b/files/polybar/wave/launch.sh
@@ -4,16 +4,20 @@
 ## Everyone is permitted to copy and distribute copies of this file under GNU-GPL3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
-CARD="$(ls /sys/class/backlight | head -n 1)"
+CARD="$(light -L | grep 'backlight' | head -n1 | cut -d'/' -f3)"
+INTERFACE="$(ip link | awk '/state UP/ {print $2}' | tr -d :)"
 RFILE="$DIR/.module"
 
-# Fix backlight module for non intel machines
-backlight() {
-	if [[ "$CARD" != *"intel_"* ]]; then
-		if [[ ! -f "$RFILE" ]]; then
-			sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
-			touch "$RFILE"
-		fi
+# Fix backlight and network modules
+fix_modules() {
+	if [[ -z "$CARD" ]]; then
+		sed -i -e 's/backlight/bna/g' "$DIR"/config.ini
+	elif [[ "$CARD" != *"intel_"* ]]; then
+		sed -i -e 's/backlight/brightness/g' "$DIR"/config.ini
+	fi
+
+	if [[ "$INTERFACE" == e* ]]; then
+		sed -i -e 's/network/ethernet/g' "$DIR"/config.ini
 	fi
 }
 
@@ -30,5 +34,8 @@ launch_bar() {
 }
 
 # Execute functions
-backlight
+if [[ ! -f "$RFILE" ]]; then
+	fix_modules
+	touch "$RFILE"
+fi	
 launch_bar
diff --git a/files/polybar/wave/modules.ini b/files/polybar/wave/modules.ini
index 3db3d43..08a8e2d 100644
--- a/files/polybar/wave/modules.ini
+++ b/files/polybar/wave/modules.ini
@@ -61,6 +61,18 @@ ramp-volume-font = 2
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
+[module/bna]
+type = custom/text
+
+content = " NA"
+content-prefix = 
+content-prefix-font = 2
+content-prefix-foreground = ${color.RED}
+content-padding = 3
+content-background = ${color.BG2}
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 [module/backlight]
 type = internal/xbacklight
 
@@ -387,15 +399,33 @@ icon-consume = ✀
 
 ;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
 
-; If you use both a wired and a wireless network, just add 2 module definitions. For example
-[module/wired-network]
-type = internal/network
-interface = wlan0
-
-[module/wireless-network]
+; If you use both a wired and a wireless network, Add both modules in config.ini
+[module/ethernet]
 type = internal/network
 interface = ${system.network_interface}
 
+interval = 1.0
+accumulate-stats = true
+unknown-as-up = true
+
+format-connected = <label-connected>
+format-connected-prefix = "歷 "
+format-connected-prefix-foreground = ${color.BLUE}
+format-connected-prefix-font = 2
+format-connected-background = ${color.BG4}
+format-connected-padding = 3
+
+format-disconnected = <label-disconnected>
+format-disconnected-prefix = "轢 "
+format-disconnected-prefix-font = 2
+format-disconnected-background = ${color.BG4}
+format-disconnected-padding = 3
+
+label-connected = "%{A1:networkmanager_dmenu &:}%downspeed% | %upspeed%%{A}"
+label-disconnected = "%{A1:networkmanager_dmenu &:}Offline%{A}"
+
+;; _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_
+
 ; Normal Module
 [module/network]
 type = internal/network