diff --git a/hosts/pleione/default.nix b/hosts/pleione/default.nix
index 8cf679c5..e02bda73 100644
--- a/hosts/pleione/default.nix
+++ b/hosts/pleione/default.nix
@@ -58,6 +58,7 @@
     postgresql.enable = true;
   };
 
+  powerManagement.powertop.enable = true;
   programs = {
     light.enable = true;
 
diff --git a/hosts/pleione/hardware-configuration.nix b/hosts/pleione/hardware-configuration.nix
index 412f868a..2cd4a1d9 100644
--- a/hosts/pleione/hardware-configuration.nix
+++ b/hosts/pleione/hardware-configuration.nix
@@ -62,5 +62,6 @@
       options = [ "subvol=nix" "noatime" "compress=zstd" ];
     };
   };
+  powerManagement.cpuFreqGovernor = "powersave";
 
 }
diff --git a/users/misterio/features/desktop-sway/sway.nix b/users/misterio/features/desktop-sway/sway.nix
index e008ec99..38cfcb83 100644
--- a/users/misterio/features/desktop-sway/sway.nix
+++ b/users/misterio/features/desktop-sway/sway.nix
@@ -5,8 +5,10 @@ let
 
   # SSH Hosts
   sshHosts = [
-    "merope.local"
+    "atlas.local"
     "maia.local"
+    "merope.local"
+    "pleione.local"
     "ubuntu@vpn.uget.express"
   ];
 
@@ -272,6 +274,9 @@ in rec {
           {
             xkb_layout = "br";
           };
+        "1:1:AT_Translated_Set_2_keyboard" = {
+          xkb_layout = "br";
+        };
         "6940:7051:ckb2:_CORSAIR_SCIMITAR_RGB_ELITE_Gaming_Mouse_vM" = {
           pointer_accel = "1";
         };
diff --git a/users/misterio/features/desktop-sway/waybar.nix b/users/misterio/features/desktop-sway/waybar.nix
index b373dedc..ae9922b7 100644
--- a/users/misterio/features/desktop-sway/waybar.nix
+++ b/users/misterio/features/desktop-sway/waybar.nix
@@ -57,12 +57,9 @@ in {
         battery = {
           bat = "BAT0";
           interval = 40;
-          format-icons = ["" "" "" "" ""];
-          states = {
-            warning = 30;
-            critical = 16;
-          };
+          format-icons = ["" "" "" "" "" "" "" "" "" ""];
           format = "{capacity}% {icon}";
+          format-charging = "{capacity}% ";
         };
         "sway/window" = { max-length = 50; };
         "sway/workspaces" = {