diff --git a/sway/waybar/config b/sway/waybar/config
index a451862..5a841df 100644
--- a/sway/waybar/config
+++ b/sway/waybar/config
@@ -31,11 +31,11 @@
     "all-outputs": true,
     "format": "{icon}",
     // "format": "< %g >",
-    // "format_focused" : "< %g ● >",
+    //"format_focused" : "< %g ● >",
     "format-icons": {
       "1": "",
       "2": "", //
-      "3": " ", //
+      "3": "", //
       "4": "",
       "5": "",
       "6": "",
@@ -59,8 +59,8 @@
     }
   },
   "tray": {
-    "icon-size": 14,
-    "spacing": 5
+    "icon-size": 16,
+    "spacing": 6
   },
   "clock": {
     "tooltip-format": "<tt><small>{calendar}</small></tt>",
@@ -86,7 +86,7 @@
       "on-scroll-down": "shift_down"
     },
     //"format": "  {:%a %d %b  %I:%M %p}", //12 hour format
-    "format": " {:%d %m %Y  %H:%M}",	//24 hour format
+    "format": "  {:%d.%m.%Y  %H:%M}",	//24 hour format
     "format-alt": "  {:%d/%m/%Y  %H:%M:%S}",
     // //"timezones": [ "Kolkata" ],
     // //"max-length": 200
@@ -99,7 +99,7 @@
     "on-click": "foot -e btop"
   },
   "memory": {
-    "format": "󰍛 {: >3}%",
+    "format": "󰍛{: >3}%",
     "on-click": "foot -e btop"
   },
   "temperature": {
@@ -107,7 +107,7 @@
     "hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
     "critical-threshold": 80,
     // "format-critical": "{temperatureC}°C ",
-    "format": "  {temperatureC}°C"
+    "format": " {temperatureC}°C"
   },
   "backlight": {
     // "device": "acpi_video1",
@@ -121,7 +121,7 @@
   "battery": {
     "states": {
       // "good": 95,
-      "warning": 30,
+      "warning": 45,
       "critical": 15
     },
     "format": "{icon} {capacity: >3}%",
@@ -155,8 +155,8 @@
       "default": ["", ""]
     },
     "on-click": "pavucontrol",
-    "on-scroll-up": "pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob",
-    "on-scroll-down": "pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob"
+    "on-scroll-up": "pamixer -ud 2 && pamixer --get-volume > $SWAYSOCK.wob",
+    "on-scroll-down": "pamixer -ui 2 && pamixer --get-volume > $SWAYSOCK.wob"
   },
   "custom/power": {
     "format": "󰐥",
diff --git a/sway/waybar/style.css b/sway/waybar/style.css
index 021d977..f777f9b 100644
--- a/sway/waybar/style.css
+++ b/sway/waybar/style.css
@@ -10,9 +10,9 @@
  * Keyframes
  * -------------------------------------------------------------------------- */
 
- @import "machiatto.css";
+@import "machiatto.css";
 
- /*
+/*
   Polar Night
   nord0  #2e3440
   nord1  #3b4252
@@ -34,307 +34,307 @@
   nord14 #a3be8c
   nord15 #b48ead
   */
- 
- /* -----------------------------------------------------------------------------
+
+/* -----------------------------------------------------------------------------
    * Base styles
    * -------------------------------------------------------------------------- */
- 
- /* Reset all styles */
- 
- * {
-     color: @lavender;
-     border: 0;
-     padding: 0 0;
-     font-family: UbuntuMono;
-     /* font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; */
-     /* font-family: "Hack Nerd Font"; */
-     font-size: 18px;
-     font-weight: bold;
-     /* padding-bottom:4px;
+
+/* Reset all styles */
+
+* {
+  color: @lavender;
+  border: 0;
+  padding: 0 0;
+  font-family: UbuntuMono;
+  /* font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; */
+  /* font-family: "Hack Nerd Font"; */
+  font-size: 18px;
+  font-weight: bold;
+  /* padding-bottom:4px;
       padding-top: 4px; */
- }
- 
- window#waybar {
-     border: 0px solid rgba(0, 0, 0, 0);
-     /* border-radius: 10px; */
-     /* background:#2d2a2e; */
-     /* background-color: rgba(36, 39, 58, 0.85); */
-     background-color: rgba(0, 0, 0, 0);
-     /* background-color: shade(#1e1e2e, 0.95); */
- }
- 
- #workspaces button {
-     color: @base;
-     border-radius: 50%;
-     /* background-color: @base; */
-     margin: 0px 0px;
-     padding: 4px 6px 2px 0px;
- }
- 
- #workspaces button:hover {
-     color: @mauve;
-     box-shadow: none; /* Remove predefined box-shadow */
-     text-shadow: none; /* Remove predefined text-shadow */
-     border: 0px;
-     background: none;
- }
- 
- #workspaces button:hover * {
-     color: @mauve;
-     /* background-color: @base; */
-     background-color: rgba(36, 39, 58, 0.6);
- }
- 
- #workspaces * {
-     color: whitesmoke;
- }
- 
- #workspaces {
-     border-style: solid;
-     /* background-color: @base; */
-     background-color: rgba(36, 39, 58, 0.6);
-     opacity: 1;
-     border-radius: 10px;
-     margin: 8px 0px 8px 8px;
- }
- 
- #workspaces button.focused {
-     color: @mauve;
-     border-radius: 20px;
-     /* background-color: @flamingo; */
- }
- 
- #workspaces button.focused * {
-     color: @mauve;
- }
- 
- #mode {
-     color: #ebcb8b;
- }
- 
- #clock,
- #custom-swap,
- #custom-cava-internal,
- #battery,
- #cpu,
- #memory,
- #idle_inhibitor,
- #temperature,
- #custom-keyboard-layout,
- #backlight,
- #network,
- #pulseaudio,
- #mode,
- #tray,
- #custom-power,
- #custom-pacman,
- #custom-launcher,
- #mpd {
-     padding: 5px 8px;
-     border-style: solid;
-     /* background-color: shade(@base, 1); */
-     background-color: rgba(36, 39, 58, 0.6);
-     opacity: 1;
-     margin: 8px 0;
- }
- 
- /* -----------------------------------------------------------------------------
+}
+
+window#waybar {
+  border: 0px solid rgba(0, 0, 0, 0);
+  /* border-radius: 10px; */
+  /* background:#2d2a2e; */
+  /* background-color: rgba(36, 39, 58, 0.85); */
+  background-color: rgba(0, 0, 0, 0);
+  /* background-color: shade(#1e1e2e, 0.95); */
+}
+
+#workspaces button {
+  color: @base;
+  border-radius: 50%;
+  /* background-color: @base; */
+  margin: 0px 0px;
+  padding: 4px 6px 2px 0px;
+}
+
+#workspaces button:hover {
+  color: @mauve;
+  box-shadow: none; /* Remove predefined box-shadow */
+  text-shadow: none; /* Remove predefined text-shadow */
+  border: 0px;
+  background: none;
+}
+
+#workspaces button:hover * {
+  color: @mauve;
+  /* background-color: @base; */
+  background-color: rgba(36, 39, 58, 0.6);
+}
+
+#workspaces * {
+  color: whitesmoke;
+}
+
+#workspaces {
+  border-style: solid;
+  /* background-color: @base; */
+  background-color: rgba(36, 39, 58, 0.6);
+  opacity: 1;
+  border-radius: 10px;
+  margin: 8px 0px 8px 8px;
+}
+
+#workspaces button.focused {
+  color: @mauve;
+  border-radius: 20px;
+  /* background-color: @flamingo; */
+}
+
+#workspaces button.focused * {
+  color: @mauve;
+}
+
+#mode {
+  color: #ebcb8b;
+}
+
+#clock,
+#custom-swap,
+#custom-cava-internal,
+#battery,
+#cpu,
+#memory,
+#idle_inhibitor,
+#temperature,
+#custom-keyboard-layout,
+#backlight,
+#network,
+#pulseaudio,
+#mode,
+#tray,
+#custom-power,
+#custom-pacman,
+#custom-launcher,
+#mpd {
+  padding: 5px 8px;
+  border-style: solid;
+  /* background-color: shade(@base, 1); */
+  background-color: rgba(36, 39, 58, 0.6);
+  opacity: 1;
+  margin: 8px 0;
+}
+
+/* -----------------------------------------------------------------------------
    * Module styles
    * -------------------------------------------------------------------------- */
- #mpd {
-     border-radius: 10px;
-     color: @mauve;
-     margin-left: 5px;
-     background-color: rgba(0, 0, 0, 0);
- }
- 
- #mpd.2 {
-     border-radius: 10px 0px 0px 10px;
-     margin: 8px 0px 8px 6px;
-     padding: 4px 12px 4px 10px;
- }
- 
- #mpd.3 {
-     border-radius: 0px 0px 0px 0px;
-     margin: 8px 0px 8px 0px;
-     padding: 4px;
- }
- 
- #mpd.4 {
-     border-radius: 0px 10px 10px 0px;
-     margin: 8px 0px 8px 0px;
-     padding: 4px 10px 4px 14px;
- }
- 
- #mpd.2,
- #mpd.3,
- #mpd.4 {
-     /* background-color: @base; */
-     background-color: rgba(36, 39, 58, 0.6);
-     font-size: 14px;
- }
- 
- #mode {
-     border-radius: 10px;
-     color: @mauve;
-     margin-right: 5px;
- }
- 
- #custom-cava-internal {
-     border-radius: 10px;
-     color: @mauve;
- }
- 
- #custom-swap {
-     border-radius: 10px;
-     color: @base;
-     margin-left: 15px;
-     background-color: @mauve;
- }
- 
- #clock {
-     /* background-color:#a3be8c; */
-     color: @sky;
-     border-radius: 10px;
-     margin: 8px 10px;
- }
- 
- #backlight {
-     color: @yellow;
-     /* border-bottom: 2px solid @yellow; */
-     border-radius: 10px 0 0 10px;
- }
- 
- #battery {
-     color: #d8dee9;
-     /* border-bottom: 2px solid #d8dee9; */
-     border-radius: 0 10px 10px 0;
-     margin-right: 10px;
- }
- 
- #battery.charging {
-     color: #81a1c1;
-     /* border-bottom: 2px solid #81a1c1; */
- }
- 
- @keyframes blink {
-     to {
-         color: @red;
-         /* border-bottom: 2px solid @red; */
-     }
- }
- 
- #battery.critical:not(.charging) {
-     color: #bf616a;
-     /* border-bottom: 2px solid #bf616a; */
-     animation-name: blink;
-     animation-duration: 0.5s;
-     animation-timing-function: linear;
-     animation-iteration-count: infinite;
-     animation-direction: alternate;
- }
- 
- #cpu {
-     color: @sky;
-     /* border-bottom: 2px solid @sky; */
- }
- 
- #cpu #cpu-icon {
-     color: @sky;
- }
- 
- #memory {
-     color: @sky;
- }
- 
- #network.disabled {
-     color: #bf616a;
-     /* border-bottom: 2px solid #bf616a; */
- }
- 
- #network {
-     color: @green;
-     /* border-bottom: 2px solid @green; */
-     border-radius: 10px;
-     margin-right: 5px;
- }
- 
- #network.disconnected {
-     color: #bf616a;
-     /* border-bottom: 2px solid #bf616a; */
- }
- 
- #pulseaudio {
-     color: @flamingo;
-     /* border-bottom: 2px solid @flamingo; */
- }
- 
- #pulseaudio.muted {
-     color: #3b4252;
-     /* border-bottom: 2px solid #3b4252; */
- }
- 
- #temperature {
-     color: @teal;
-     /* border-bottom: 2px solid @teal; */
-     border-radius: 10px 0 0 10px;
- }
- 
- #temperature.critical {
-     color: @red;
-     /* border-bottom: 2px solid @red; */
- }
- 
- #idle_inhibitor {
-     background-color: #ebcb8b;
-     color: @base;
- }
- 
- #tray {
-     /* background-color: @base; */
-     margin: 8px 10px;
-     border-radius: 10px;
- }
- 
- #custom-launcher,
- #custom-power {}
- 
- #custom-launcher {
-     background-color: @mauve;
-     color: @base;
-     border-radius: 10px;
-     padding: 5px 10px;
-     margin-left: 15px;
- }
- 
- #custom-power {
-     color: @base;
-     background-color: @red;
-     border-radius: 10px;
-     margin-left: 5px;
-     margin-right: 15px;
-     padding: 5px 10px;
- }
- 
- #window {
-     border-style: hidden;
-     margin-left: 10px;
-     /* margin-top:1px;  
+#mpd {
+  border-radius: 10px;
+  color: @mauve;
+  margin-left: 5px;
+  background-color: rgba(0, 0, 0, 0);
+}
+
+#mpd.2 {
+  border-radius: 10px 0px 0px 10px;
+  margin: 8px 0px 8px 6px;
+  padding: 4px 12px 4px 10px;
+}
+
+#mpd.3 {
+  border-radius: 0px 0px 0px 0px;
+  margin: 8px 0px 8px 0px;
+  padding: 4px;
+}
+
+#mpd.4 {
+  border-radius: 0px 10px 10px 0px;
+  margin: 8px 0px 8px 0px;
+  padding: 4px 10px 4px 14px;
+}
+
+#mpd.2,
+#mpd.3,
+#mpd.4 {
+  /* background-color: @base; */
+  background-color: rgba(36, 39, 58, 0.6);
+  font-size: 14px;
+}
+
+#mode {
+  border-radius: 10px;
+  color: @mauve;
+  margin-right: 5px;
+}
+
+#custom-cava-internal {
+  border-radius: 10px;
+  color: @mauve;
+}
+
+#custom-swap {
+  border-radius: 10px;
+  color: @base;
+  margin-left: 15px;
+  background-color: @mauve;
+}
+
+#clock {
+  /* background-color:#a3be8c; */
+  color: @sky;
+  border-radius: 10px;
+  margin: 8px 10px;
+}
+
+#backlight {
+  color: @yellow;
+  /* border-bottom: 2px solid @yellow; */
+  border-radius: 10px 0 0 10px;
+}
+
+#battery {
+  color: #d8dee9;
+  /* border-bottom: 2px solid #d8dee9; */
+  border-radius: 0 10px 10px 0;
+  margin-right: 10px;
+}
+
+#battery.charging {
+  color: #81a1c1;
+  /* border-bottom: 2px solid #81a1c1; */
+}
+
+@keyframes blink {
+  to {
+    color: @red;
+    /* border-bottom: 2px solid @red; */
+  }
+}
+
+#battery.critical:not(.charging) {
+  color: #bf616a;
+  /* border-bottom: 2px solid #bf616a; */
+  animation-name: blink;
+  animation-duration: 0.5s;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+
+#cpu {
+  color: @sky;
+  /* border-bottom: 2px solid @sky; */
+}
+
+#cpu #cpu-icon {
+  color: @sky;
+}
+
+#memory {
+  color: @sky;
+}
+
+#network.disabled {
+  color: #bf616a;
+  /* border-bottom: 2px solid #bf616a; */
+}
+
+#network {
+  color: @green;
+  /* border-bottom: 2px solid @green; */
+  border-radius: 10px;
+  margin-right: 5px;
+}
+
+#network.disconnected {
+  color: #bf616a;
+  /* border-bottom: 2px solid #bf616a; */
+}
+
+#pulseaudio {
+  color: @flamingo;
+  /* border-bottom: 2px solid @flamingo; */
+}
+
+#pulseaudio.muted {
+  color: #3b4252;
+  /* border-bottom: 2px solid #3b4252; */
+}
+
+#temperature {
+  color: @teal;
+  /* border-bottom: 2px solid @teal; */
+  border-radius: 10px 0 0 10px;
+}
+
+#temperature.critical {
+  color: @red;
+  /* border-bottom: 2px solid @red; */
+}
+
+#idle_inhibitor {
+  background-color: #ebcb8b;
+  color: @base;
+}
+
+#tray {
+  /* background-color: @base; */
+  margin: 8px 10px;
+  border-radius: 10px;
+}
+
+#custom-launcher,
+#custom-power {
+}
+
+#custom-launcher {
+  background-color: @mauve;
+  color: @base;
+  border-radius: 10px;
+  padding: 5px 10px;
+  padding-right: 5px;
+  margin-left: 15px;
+}
+
+#custom-power {
+  color: @base;
+  background-color: @red;
+  border-radius: 10px;
+  margin-left: 5px;
+  margin-right: 15px;
+  padding: 5px 10px;
+}
+
+#window {
+  border-style: hidden;
+  margin-left: 10px;
+  /* margin-top:1px;  
       padding: 8px 1rem; */
-     margin-right: 10px;
-     color: #eceff4;
- }
- 
- #custom-keyboard-layout {
-     color: @peach;
-     /* border-bottom: 2px solid @peach; */
-     border-radius: 0 10px 10px 0;
-     margin-right: 10px;
- }
- 
- 
- 
- /* window#waybar {
+  margin-right: 10px;
+  color: #eceff4;
+}
+
+#custom-keyboard-layout {
+  color: @peach;
+  /* border-bottom: 2px solid @peach; */
+  border-radius: 0 10px 10px 0;
+  margin-right: 10px;
+}
+
+/* window#waybar {
       background: #2d2a2e;
   }
   
@@ -410,4 +410,4 @@
   
   #temperature.critical {
       color: #bf616a;
-  } */
\ No newline at end of file
+  } */