diff --git a/waybar/.config/waybar/modules/battery.jsonc b/waybar/.config/waybar/modules/battery.jsonc
new file mode 100644
index 0000000..f7a5849
--- /dev/null
+++ b/waybar/.config/waybar/modules/battery.jsonc
@@ -0,0 +1,35 @@
+{
+  "group/battery-group": {
+    "orientation": "inherit",
+    "drawer": {
+      "transition-duration": 300,
+      "children-class": "battery-child",
+      "transition-left-to-right": false
+    },
+    "modules": [ "battery", "battery#percentage" ]
+  },
+  
+  "battery": {
+    "interval": 60,
+    "tooltip": false,
+    "format": "{icon}",
+    "format-icons": [ "󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹" ],
+    "format-charging": "{capacity}% 󰂄",
+    "format-critical": "{capacity}% 󰂃",
+    "states": {
+      "warning": 25,
+      "critical": 10
+    }
+  },
+  
+  "battery#percentage": {
+    "interval": 60,
+    "tooltip": false,
+    "format": "{capacity}%",
+    "format-charging": "",
+    "format-critical": "",
+    "states": {
+      "critical": 10
+    }
+  }
+}
diff --git a/waybar/.config/waybar/modules/network.jsonc b/waybar/.config/waybar/modules/network.jsonc
new file mode 100644
index 0000000..defdd7b
--- /dev/null
+++ b/waybar/.config/waybar/modules/network.jsonc
@@ -0,0 +1,29 @@
+{
+  "group/network-group": {
+    "orientation": "inherit",
+    "drawer": {
+      "transition-duration": 300,
+      "children-class": "network-child",
+      "transition-left-to-right": false
+    },
+    "modules": [ "network", "network#name" ]
+  },
+  
+  "network": {
+    "interval": 60,
+    "tooltip": false,
+    "format": "{icon}",
+    "format-icons": {
+      "wifi": [ "󰤯", "󰤟", "󰤢", "󰤥", "󰤨" ],
+      "ethernet": [ "󰌹" ],
+      "disconnected": [ "󰌺" ]
+    }
+  },
+  
+  "network#name": {
+    "interval": 2,
+    "tooltip": false,
+    "format-wifi": "{bandwidthTotalBytes}  {signalStrength}%  {essid}",
+    "format-ethernet": "{bandwidthTotalBytes}  {ifname}"
+  }
+}
diff --git a/waybar/.config/waybar/modules/power.jsonc b/waybar/.config/waybar/modules/power.jsonc
new file mode 100644
index 0000000..e095259
--- /dev/null
+++ b/waybar/.config/waybar/modules/power.jsonc
@@ -0,0 +1,28 @@
+{
+  "group/power": {
+    "orientation": "inherit",
+    "drawer": {
+      "transition-duration": 300,
+      "children-class": "power-child"
+    },
+    "modules": [ "custom/power", "custom/reboot", "custom/logout" ]
+  },
+  
+  "custom/power": {
+    "format": "",
+    "tooltip": false,
+    "on-click": "$HOME/.config/waybar/scripts/killwindows.sh && sleep 1 && systemctl poweroff"
+  },
+  
+  "custom/reboot": {
+    "format": "",
+    "tooltip": false,
+    "on-click": "$HOME/.config/waybar/scripts/killwindows.sh && sleep 1 && reboot"
+  },
+  
+  "custom/logout": {
+    "format": "󰍃",
+    "tooltip": false,
+    "on-click": "hyprctl dispatch exit"
+  }
+}
diff --git a/waybar/.config/waybar/modules/tray.jsonc b/waybar/.config/waybar/modules/tray.jsonc
new file mode 100644
index 0000000..3c6317b
--- /dev/null
+++ b/waybar/.config/waybar/modules/tray.jsonc
@@ -0,0 +1,21 @@
+{
+  "group/tray-group": {
+    "orientation": "inherit",
+    "drawer": {
+      "transition-duration": 300,
+      "children-class": "tray-child",
+      "transition-left-to-right": false
+    },
+    "modules": [ "custom/expand", "tray" ]
+  },
+  
+  "custom/expand": {
+    "format": "",
+    "tooltip": false
+  },
+  
+  "tray": {
+    "icon-size": 16,
+    "spacing": 10
+  }
+}
diff --git a/waybar/.config/waybar/modules/updates.jsonc b/waybar/.config/waybar/modules/updates.jsonc
new file mode 100644
index 0000000..7644663
--- /dev/null
+++ b/waybar/.config/waybar/modules/updates.jsonc
@@ -0,0 +1,8 @@
+{
+  "custom/updates": {
+    "format": "  {}",
+    "interval": 1800,   
+    "exec": "checkupdates | wc -l",
+    "tooltip": false
+  }
+}