diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index 1f10715..90ea492 100644
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -47,6 +47,9 @@ in
     pkgs-unstable.hyprlock
     pkgs-unstable.hypridle
 
+    pkgs.grim
+    pkgs.slurp
+
   ];
 
   wayland.windowManager.hyprland = {
@@ -428,7 +431,7 @@ in
         ###########################################################################
         ## MEGA KEYS:
 
-        ", Print, exec, /home/nx2/scripts/screenshot.sh "
+        ''     , Print, exec, grim -g "$(slurp)"''
         "SUPER, Next, resizeactive, 100 -100"
         "SUPER, Prior, resizeactive, -100 100"
 
diff --git a/home-modules/nx-gcal-event.nix b/home-modules/nx-gcal-event.nix
index 6a7effe..581b557 100644
--- a/home-modules/nx-gcal-event.nix
+++ b/home-modules/nx-gcal-event.nix
@@ -1,5 +1,7 @@
 { config, pkgs, secrets, ... }:
-let in
+let
+    sep = " ";
+in
 {
   home = {
     file."${config.xdg.dataHome}/nx-gcal-event-credentials.json".text = ''
@@ -176,7 +178,7 @@ let in
 
                 name = escape(event['summary'])
 
-                print(f"󱙬  {sec_to_nice_string(remaining.seconds)}{mode}\'{name}\'")
+                print(f"󱙬${sep}{sec_to_nice_string(remaining.seconds)}{mode}\'{name}\'")
                 exit(0)
 
         def print_help():
diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index 681fd0d..2ea1873 100644
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -1,5 +1,6 @@
 { config, lib, pkgs, rice, ... }:
 let
+  sep = " "; 
 in
 {
   imports = [
@@ -46,7 +47,7 @@ in
       #ord=$(date +"%e" | awk '{printf("%d%s\n", $1, substr("thstndrd", ($1%100-20)%10*2+1, 2))}')
       ord=$(date +"%e" | awk '{printf("%d%s\n", $1, ($1==11||$1==12||$1==13)?"th":((($1%10)==1)?"st":((($1%10)==2)?"nd":((($1%10)==3)?"rd":"th"))))}')
       if [ $# -eq 0 ]; then
-        echo "󰃮  $(date +'%A the')" "$ord" "of" "$(date +'%B')" "  " "$(date +'%R')"
+        echo "󰃮${sep}$(date +'%A the')" "$ord" "of" "$(date +'%B')" " ${sep}" "$(date +'%R')"
       elif [ "$1" = "--no-icons" ]; then
         echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')"  "$(date +'%R')"
       fi
@@ -68,8 +69,8 @@ in
         margin-right = rice.gap-size;
         spacing = 10;
         modules-left = [
-          "cpu"
-          "memory"
+          # "cpu"
+          # "memory"
           "wireplumber"
           "backlight"
           "battery"
@@ -111,17 +112,17 @@ in
 
         cpu = {
           interval = 1;
-          format = "󰍛 {}%";
+          format = "󰍛${sep}{}%";
           max-length = 10;
         };
         memory = {
           interval = 5;
-          format = "  {avail:.0f}G free";
+          format = "${sep}{avail:.0f}G free";
         };
         battery = {
           interval = 60;
           tooltip = false;
-          format = "{icon}  {capacity}%";
+          format = "{icon}${sep}{capacity}%";
           states = {
             warning = 25;
             critical = 10;
@@ -133,13 +134,13 @@ in
             " "
             " "
           ];
-          format-charging = "{icon} +{capacity}%";
-          format-plugged = "{icon} P{capacity}%";
-          format-full = "{icon} F{capacity}%";
+          format-charging = "{icon}${sep}+{capacity}%";
+          format-plugged = "{icon}${sep}P{capacity}%";
+          format-full = "{icon}${sep}F{capacity}%";
         };
         backlight = {
-          device = "DP-1";
-          format = "{icon}  {percent}%";
+          device = "eDP-1";
+          format = "{icon}${sep}{percent}%";
           format-icons = [
             ""
             ""
@@ -153,13 +154,13 @@ in
           ];
         };
         network = {
-          format-wifi = " {essid}";
-          format-ethernet = "󰈀 Wired";
-          format-disconnected = "󰌙 Disconnected";
+          format-wifi = "${sep}{essid}";
+          format-ethernet = "󰈀${sep}Wired";
+          format-disconnected = "󰌙${sep}Disconnected";
         };
         wireplumber = {
-          format = "󰕾 {volume}%";
-          format-muted = " Muted";
+          format = "󰕾${sep}{volume}%";
+          format-muted = "󰝟${sep}Muted";
         };
       };
     };
@@ -174,7 +175,7 @@ in
 
       window#waybar {
         background-color: rgba(${rice.lib.hex-to-rgb-comma-string rice.color.background},${builtins.toString rice.transparency});
-        transition-duration: 0.5s;
+        transition-duration: 2s;
         padding: 7px 10px;
         padding-top: 0.1em;
         /* border: ${builtins.toString rice.border-width}px solid rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue}); */
@@ -227,9 +228,10 @@ in
         color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.red});
       }
 
-      #cpu {
-        margin-left: 0.5em;
-      } 
+      #window {
+        font-family: ${rice.font.base.name};
+        color: rgb(${rice.lib.hex-to-rgb-comma-string rice.color.blue});
+      }
     '';
 
   };