diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf
index 36f0cd7..5a7b312 100644
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@@ -19,17 +19,17 @@ listener {
 # }
 
 listener {
-    timeout = 300                                 # 5min
+    timeout = 1800                                # 30 min
     on-timeout = loginctl lock-session            # lock screen when timeout has passed
 }
 
 listener {
-    timeout = 330                                 # 5.5min
+    timeout = 1800                                # 30 min
     on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
     on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
 }
 
-listener {
-    timeout = 1800                                # 30min
-    on-timeout = systemctl suspend                # suspend pc
-}
+#listener {
+#    timeout = 1800                                # 30min
+#    on-timeout = systemctl suspend                # suspend pc
+#}
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 709b6e6..a35c440 100755
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -52,9 +52,9 @@ input {
 general {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-    gaps_in = 1
-    gaps_out = 2
-    border_size = 1
+    gaps_in = 2
+    gaps_out = 4
+    border_size = 2
     col.active_border = $blue
     col.inactive_border = $overlay0
 
diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf
index 96d4dca..e7bea44 100644
--- a/hypr/hyprlock.conf
+++ b/hypr/hyprlock.conf
@@ -58,7 +58,7 @@ label {
 # INPUT FIELD
 input-field {
     monitor =
-    size = 300, 60
+    size = 900, 60
     outline_thickness = 4
     dots_size = 0.2
     dots_spacing = 0.2
diff --git a/waybar/config b/waybar/config
index 019a97a..2aa41dc 100644
--- a/waybar/config
+++ b/waybar/config
@@ -11,7 +11,7 @@
   "margin-bottom": 3,
   "modules-left": ["custom/junkyard", "hyprland/workspaces"],
   "modules-center": ["clock"],
-  "modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "network", "backlight", "battery"],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "network", "memory", "cpu", "group/group-power"],
   "tray": {
     "icon-size": 16,
     "spacing": 10
diff --git a/waybar/modules.jsonc b/waybar/modules.jsonc
index 118cb6b..a83a372 100755
--- a/waybar/modules.jsonc
+++ b/waybar/modules.jsonc
@@ -12,8 +12,8 @@
     "hyprland/workspaces": {
         "format": "{name}",
         "tooltip-format": "{title}",
-        "on-scroll-up": "hyprctl dispatch workspace r+1",
-        "on-scroll-down": "hyprctl dispatch workspace r-1",
+        "on-scroll-up": "hyprctl dispatch workspace r-1",
+        "on-scroll-down": "hyprctl dispatch workspace r+1",
         "on-click": "activate"
     },
     "clock": {
@@ -91,12 +91,66 @@
         "escape": true
     },
 
-	"backlight": {
-    "device": "acpi_video0",
-    "format": "{icon}",
-    "format-icons": ["󰃞", "󰃟", "󰃠"],
-		"on-click": "~/.config/rofi/applets/bin/brightness.sh"
-	},
+  "cpu": {
+    "interval": 1,
+    "format": "  {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
+    "format-icons": [
+      "<span color='#a6da95'>▁</span>", // green
+      "<span color='#8aadf4'>▂</span>", // blue
+      "<span color='#8aadf4'>▃</span>", // white
+      "<span color='#8aadf4'>▄</span>", // white
+      "<span color='#8aadf4'>▅</span>", // yellow
+      "<span color='#eed49f'>▆</span>", // yellow
+      "<span color='#f5a97f'>▇</span>", // orange
+      "<span color='#ed8796'>█</span>"  // red
+     ]
+  },
+
+  "memory": {
+      "interval": 5,
+      "format": "󰍛 {percentage}%"
+  },
+
+  "group/group-power": {
+      "orientation": "inherit",
+      "drawer": {
+          "transition-duration": 500,
+          "children-class": "not-power",
+          "transition-left-to-right": true
+      },
+      "modules": [
+          "custom/power", // First element is the "group leader" and won't ever be hidden
+          "custom/reboot",
+          "custom/quit",
+          "custom/suspend",
+          "custom/lock"
+      ]
+  },
+  "custom/quit": {
+      "format": " 󰗼 ",
+      "tooltip": false,
+      "on-click": "hyprctl dispatch exit"
+  },
+  "custom/lock": {
+      "format": " 󰍁 ",
+      "tooltip": false,
+      "on-click": "loginctl lock-session"
+  },
+  "custom/suspend": {
+    "format": " 󰒲 ",
+    "tooltip": false,
+    "on-click": "systemctl suspend"
+  },
+  "custom/reboot": {
+      "format": " 󰜉 ",
+      "tooltip": false,
+      "on-click": "systemctl reboot"
+  },
+  "custom/power": {
+      "format": "  ",
+      "tooltip": false,
+      "on-click": "systemctl poweroff"
+  },
 
 	"battery": {
 		"states": {
@@ -113,6 +167,7 @@
 	"battery#bat0": {
 		"bat": "BAT0"
 	},
+
 	"network": {
 		"format-wifi": "{icon}",
 		"format-ethernet": "󰈀",
diff --git a/waybar/style.css b/waybar/style.css
index f4d65c3..2da86ca 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -57,6 +57,7 @@ button {
 #custom-notification,
 #pulseaudio,
 #network,
+#memory,
 #bluetooth {
   background-color: @base; /* Change this to any gray color you want */
   border-radius: 0px; /* Adjust as needed */
@@ -65,6 +66,14 @@ button {
   margin: 0px;
 }
 
+#cpu {
+  background-color: @base; /* Change this to any gray color you want */
+  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
+  padding: 3px 10px;
+  color: @text;
+  min-width: 130px;
+}
+
 #backlight {
   background-color: @base; /* Change this to any gray color you want */
   border-radius: 0px 10px 10px 0px; /* Adjust as needed */
@@ -94,6 +103,13 @@ button {
   color: @text;
 }
 
+#group-power {
+  background-color: @base;
+  border-radius: 10px;
+  padding: 3px 5px;
+  margin-left: 3px;
+}
+
 #battery {
   background-color: @base; /* Change this to any gray color you want */
   color: @text;