6 files changed, 70 insertions, 19 deletions
diff --git a/waybar/style.css b/waybar/base.css
index efff8ea..2ef85f0 100644
--- a/waybar/style.css
+++ b/waybar/base.css
@@ -1,5 +1,3 @@
-/* window.eDP-1 * { font-size: 18px; } */
-
 * {
 	/* font-family: "curie"; */
 	font-family: "IBM 3270";
@@ -11,7 +9,7 @@
 
 window#waybar {
 	/* background: transparent; */
-	background: #282828;
+	background: @background;
 
 }
 
@@ -20,26 +18,26 @@ window#waybar.hidden {
 }
 
 #window {
-	color: #ebdbb2;
+	color: @foreground;
 }
 
 #tags {
 }
 
 #tags button {
-	color: #4c566a;
+	color: @regular2;
 	background: transparent;
 }
 
 #tags button.occupied {
 	transition: none;
-	color: #a3be8c;
+	color: @regular3;
 	background: transparent;
 }
 
 #tags button.focused {
-	color: #81a1c1;
-	background: #4C566A;
+	color: @background;
+	background: @regular3;
 
 	border-radius: inherit;
 }
@@ -48,26 +46,26 @@ window#waybar.hidden {
 	transition: none;
 	box-shadow: inherit;
 	text-shadow: inherit;
-	color: #81a1c1;
+	color: @bright2;
 }
 
 #temperature {
 	background: transparent;
-	color: #81A1C1;
+	color: @bright1;
 }
 
 #pulseaudio {
-	color: #D08770;
+	color: @bright1;
 	background: transparent;
 }
 
 #battery {
-	color: #A3BE8C;
+	color: @bright3;
 	background: transparent;
 }
 
 .modules-right {
-	color: #8FBCBB;
+	color: @bright1;
 }
 
 #network, #cpuTemp, #battery, #pulseaudio, #date, #powerUsage {
diff --git a/waybar/config b/waybar/config
index e9543fc..204d601 100644
--- a/waybar/config
+++ b/waybar/config
@@ -50,11 +50,6 @@
 		"format-charging": "bat: {capacity}% charging",
 		"format-plugged": "bat: {capacity}% AC"
 	},
-	"upower": {
-		"show-icon": false,
-		"native-path": "BAT0",
-		"format": "bat: {percentage} {time}"
-	},
 	"tray":{
 		"icon-size":18,
 		"show-passive-items":true,
diff --git a/waybar/custom/network b/waybar/custom/network
index 1d5f226..47409bb 100755
--- a/waybar/custom/network
+++ b/waybar/custom/network
@@ -6,7 +6,7 @@ wireless_info() {
 	"$_if" \
 	"$(nmcli c | awk "/$_if/"'{print $1}')" \
 	"$(ip -4 addr show dev "$_if" | awk '/inet /{print $2}')" \
-	"$(awk "/^$_if/"'{print $4+0}' /proc/net/wireless)dbm"
+	"$(awk "/^$_if/"'{n=$4+0;if(n!=0){print $4+0}}' /proc/net/wireless)dbm"
 }
 
 eth_info() {
diff --git a/waybar/style-dark.css b/waybar/style-dark.css
new file mode 100644
index 0000000..b8571d3
--- /dev/null
+++ b/waybar/style-dark.css
@@ -0,0 +1,20 @@
+@define-color background #282828;
+@define-color foreground #ebdbb2;
+@define-color regular0 #282828;
+@define-color regular1 #cc241d;
+@define-color regular2 #98971a;
+@define-color regular3 #d79921;
+@define-color regular4 #458588;
+@define-color regular5 #b16286;
+@define-color regular6 #689d6a;
+@define-color regular7 #a89984;
+@define-color bright0 #928374;
+@define-color bright1 #fb4934;
+@define-color bright2 #b8bb26;
+@define-color bright3 #fabd2f;
+@define-color bright4 #83a598;
+@define-color bright5 #d3869b;
+@define-color bright6 #8ec07c;
+@define-color bright7 #ebdbb2;
+
+@import url("base.css");
diff --git a/waybar/style-light.css b/waybar/style-light.css
new file mode 100644
index 0000000..eff5379
--- /dev/null
+++ b/waybar/style-light.css
@@ -0,0 +1,20 @@
+@define-color background #fbf1c7;
+@define-color foreground #3c3836;
+@define-color regular0 #fbf1c7;
+@define-color regular1 #cc241d;
+@define-color regular2 #98971a;
+@define-color regular3 #d79921;
+@define-color regular4 #458588;
+@define-color regular5 #b16286;
+@define-color regular6 #689d6a;
+@define-color regular7 #7c6f64;
+@define-color bright0 #928374;
+@define-color bright1 #9d0006;
+@define-color bright2 #79740e;
+@define-color bright3 #b57614;
+@define-color bright4 #076678;
+@define-color bright5 #8f3f71;
+@define-color bright6 #427b58;
+@define-color bright7 #3c3836;
+
+@import url("base.css");
diff --git a/waybar/theme.css b/waybar/theme.css
new file mode 100644
index 0000000..0c789ca
--- /dev/null
+++ b/waybar/theme.css
@@ -0,0 +1,18 @@
+@define-color background #282828;
+@define-color foreground #ebdbb2;
+@define-color regular0 #282828;
+@define-color regular1 #cc241d;
+@define-color regular2 #98971a;
+@define-color regular3 #d79921;
+@define-color regular4 #458588;
+@define-color regular5 #b16286;
+@define-color regular6 #689d6a;
+@define-color regular7 #a89984;
+@define-color bright0 #928374;
+@define-color bright1 #fb4934;
+@define-color bright2 #b8bb26;
+@define-color bright3 #fabd2f;
+@define-color bright4 #83a598;
+@define-color bright5 #d3869b;
+@define-color bright6 #8ec07c;
+@define-color bright7 #ebdbb2;