diff --git a/home-manager/wayland/eww/eww.yuck b/home-manager/wayland/eww/eww.yuck
index b0aee77..35038fa 100644
--- a/home-manager/wayland/eww/eww.yuck
+++ b/home-manager/wayland/eww/eww.yuck
@@ -381,7 +381,7 @@
                :artist-limit 30
                :title-limit 25)))
 
-(defwidget earth_bar_right_edge []
+(defwidget earth_bar_right_edge [screen]
   (box :orientation "h"
        :space-evenly false
        :halign "end"
@@ -394,7 +394,7 @@
     (bar_storage)
     (bar_ram)
     (bar_sep)
-    (bar_idleinhibit)))
+    (bar_power :screen screen)))
 
 (defwidget earth_bar_layout [screen]
   (centerbox :class "bar"
@@ -408,7 +408,7 @@
     (box :orientation "h"
          :space-evenly false
       (earth_bar_right_wing)
-      (earth_bar_right_edge))))
+      (earth_bar_right_edge :screen screen))))
 
 
 (defwindow fire_bar [screen]
diff --git a/home-manager/wayland/wltools.nix b/home-manager/wayland/wltools.nix
index 9d8eb2f..9359079 100644
--- a/home-manager/wayland/wltools.nix
+++ b/home-manager/wayland/wltools.nix
@@ -12,79 +12,83 @@
   # Hyprlock
 
   programs.hyprlock.enable = true;
-  programs.hyprlock.settings = {
-    general = {
-      hide_cursor = true;
-      disable_loading_bar = true;
-      grace = 180;
+  programs.hyprlock.settings =
+    let
+      adjustX = x: if config.machine == "earth" then builtins.floor (x / 2) else x;
+      adjustY = y: if config.machine == "earth" then builtins.floor (y / 1.8) else y;
+    in {
+      general = {
+        hide_cursor = true;
+        disable_loading_bar = true;
+        grace = 180;
+      };
+
+      background = [
+        {
+          monitor = "";
+          path = "screenshot";
+          blur_passes = 2;
+          blur_size = 6;
+          brightness = 0.4;
+          contrast = 0.5;
+        }
+      ];
+
+      label = [
+        {
+          monitor = "";
+          halign = "center";
+          valign = "center";
+          position = "0, ${builtins.toString (adjustY 480)}";
+          text = "cmd[update:1000] date '+%H:%M:%S'";
+          color = "rgb(a9b1d6)";
+          font_family = "Quicksand";
+          font_size = adjustY 102;
+        }
+        {
+          monitor = "";
+          halign = "center";
+          valign = "center";
+          position = "0, ${builtins.toString (adjustY 370)}";
+          text = "cmd[update:60000] date '+%A  %Y-%m-%d'";
+          color = "rgb(a9b1d6)";
+          font_family = "Quicksand";
+          font_size = adjustY 32;
+        }
+        {
+          monitor = "";
+          halign = "center";
+          valign = "center";
+          position = "0, ${builtins.toString (adjustY (-240))}";
+          text = "Login: $USER";
+          color = "rgb(a9b1d6)";
+          font_family = "Quicksand";
+          font_size = adjustY 26;
+        }
+      ];
+
+      input-field = [
+        {
+          monitor = "";
+          halign = "center";
+          valign = "center";
+          size = "${builtins.toString (adjustX 800)}, ${builtins.toString (adjustY 70)}";
+          position = "0, ${builtins.toString (adjustY (-160))}";
+          dots_center = true;
+          fade_on_empty = false;
+          font_family = "Quicksand";
+          font_color = "rgb(a9b1d6)";
+          inner_color = "rgb(1a1b26)";
+          outer_color = "rgb(a9b1d6)";
+          check_color = "rgb(e0af68)";
+          fail_color = "rgb(f7768e)";
+          outline_thickness = 3;
+          placeholder_text = ''<span foreground="##565f89">Password</span>'';
+          shadow_passes = 2;
+        }
+      ];
     };
 
-    background = [
-      {
-        monitor = "";
-        path = "screenshot";
-        blur_passes = 2;
-        blur_size = 6;
-        brightness = 0.4;
-        contrast = 0.5;
-      }
-    ];
-
-    label = [
-      {
-        monitor = "";
-        halign = "center";
-        valign = "center";
-        position = "0, 480";
-        text = "cmd[update:1000] date '+%H:%M:%S'";
-        color = "rgb(a9b1d6)";
-        font_family = "Quicksand";
-        font_size = 102;
-      }
-      {
-        monitor = "";
-        halign = "center";
-        valign = "center";
-        position = "0, 370";
-        text = "cmd[update:60000] date '+%A  %Y-%m-%d'";
-        color = "rgb(a9b1d6)";
-        font_family = "Quicksand";
-        font_size = 32;
-      }
-      {
-        monitor = "";
-        halign = "center";
-        valign = "center";
-        position = "0, -240";
-        text = "Login: $USER";
-        color = "rgb(a9b1d6)";
-        font_family = "Quicksand";
-        font_size = 26;
-      }
-    ];
-
-    input-field = [
-      {
-        monitor = "";
-        halign = "center";
-        valign = "center";
-        size = "800, 70";
-        position = "0, -160";
-        dots_center = true;
-        fade_on_empty = false;
-        font_family = "Quicksand";
-        font_color = "rgb(a9b1d6)";
-        inner_color = "rgb(1a1b26)";
-        outer_color = "rgb(a9b1d6)";
-        check_color = "rgb(e0af68)";
-        fail_color = "rgb(f7768e)";
-        outline_thickness = 3;
-        placeholder_text = ''<span foreground="##565f89">Password</span>'';
-        shadow_passes = 2;
-      }
-    ];
-  };
-
   # Swaybg
 
   systemd.user.services.swaybg = {