diff --git a/README.md b/README.md
index 370845e..87bafa4 100644
--- a/README.md
+++ b/README.md
@@ -129,7 +129,7 @@ including:
 
   ensures there is only one valid ssh-agent running at the same time. Useful when creating ssh-agent somewhere else than the login shell scripts or across sessions.
 
-- `screenshot`
+- `screenshot-script`
 
   takes a screenshot, and sends a notification asking whether to edit it by clicking on it. Works on both Hyprland and Niri.
 
diff --git a/config/hypr/.config/hypr/hyprland/keybinds.conf b/config/hypr/.config/hypr/hyprland/keybinds.conf
index 7b5e4dd..b8078d3 100755
--- a/config/hypr/.config/hypr/hyprland/keybinds.conf
+++ b/config/hypr/.config/hypr/hyprland/keybinds.conf
@@ -29,9 +29,9 @@ bind = , mouse:277, exec, killall rofi || rofi -show drun
 bind = Super, V, exec, pkill rofi || cliphist list | rofi -dmenu -config ~/.config/rofi/dmenu.rasi -display-columns 2 -i | cliphist decode | wl-copy # Clipboard history >> clipboard
 bind = Super, Period, exec, pkill rofi || rofi-emoji # Pick emoji >> clipboard
 bind = Ctrl+Alt, Delete, exec, pkill wlogout || wlogout -p layer-shell # [hidden]
-bind = Super+Shift, S, exec, screenshot area # Screen snip
-bind = Super+Ctrl+Shift, S, exec, screenshot window # Screen snip (window)
-bind = , Print, exec, screenshot full # Screen snip (whole screen)
+bind = Super+Shift, S, exec, screenshot-script area # Screen snip
+bind = Super+Ctrl+Shift, S, exec, screenshot-script window # Screen snip (window)
+bind = , Print, exec, screenshot-script full # Screen snip (whole screen)
 # Color picker
 bind = Super+Shift, C, exec, hyprpicker -a # Pick color (Hex) >> clipboard
 # Fullscreen screenshot
diff --git a/config/niri/.config/niri/config.kdl b/config/niri/.config/niri/config.kdl
index 72bfe3e..7dcb6cc 100644
--- a/config/niri/.config/niri/config.kdl
+++ b/config/niri/.config/niri/config.kdl
@@ -322,9 +322,9 @@ binds {
     Mod+V { spawn-sh "pkill -x rofi || rofi-cliphist"; }
     Mod+Period { spawn-sh "pkill -x rofi || rofi-emoji"; }
     Ctrl+Alt+Delete { spawn-sh "pkill -x wlogout || wlogout -p layer-shell"; }
-    Print { spawn-sh "screenshot full"; }
-    Mod+Shift+S { spawn-sh "screenshot area"; }
-    Mod+Ctrl+Shift+S { spawn-sh "screenshot window"; }
+    Print { spawn-sh "screenshot-script full"; }
+    Mod+Shift+S { spawn-sh "screenshot-script area > /home/kolkas/temp.log 2>&1"; }
+    Mod+Ctrl+Shift+S { spawn-sh "screenshot-script window"; }
     Mod+Shift+C { spawn-sh "hyprpicker -a"; }
 
     // Session
diff --git a/config/scripts/.local/scripts/screenshot b/config/scripts/.local/scripts/screenshot-script
similarity index 85%
rename from config/scripts/.local/scripts/screenshot
rename to config/scripts/.local/scripts/screenshot-script
index fd2be65..fccf409 100755
--- a/config/scripts/.local/scripts/screenshot
+++ b/config/scripts/.local/scripts/screenshot-script
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
 import argparse
-import os
+import subprocess
+import time
+from os import environ
 from datetime import datetime
 from enum import Enum
-import time
 from pathlib import Path
+from shutil import copy2
 
 # autopep8: off
 import gi
@@ -29,22 +31,22 @@ def wait_until_file_exists(filepath: Path, timeout: int = 5):
     while not filepath.exists():
         if time.time() - start_time > timeout:
             return False
-        time.sleep(0.1)
+        time.sleep(0.05)
     return True
 
 
 def take_screenshot(filepath: Path, typeStr: str):
     type = ScreenshotType(typeStr)
-    currentDesktop = os.environ.get("XDG_CURRENT_DESKTOP", "")
+    currentDesktop = environ.get("XDG_CURRENT_DESKTOP", "")
     if "Hyprland" in currentDesktop:
         cmd = {
             ScreenshotType.FULL: f"hyprshot -z -m output -m active -o {SCREENSHOT_DIR} -f ",  # since I only have one monitor
             ScreenshotType.AREA: f"hyprshot -z -m region -o {SCREENSHOT_DIR} -f ",
             ScreenshotType.WINDOW: f"hyprshot -z -m window -o {SCREENSHOT_DIR} -f ",
         }
-        if os.system(f"{cmd[type]}{filepath.name}"):
-            print("Failed to take screenshot.")
-            exit(1)
+        process = subprocess.run(f"{cmd[type]}{filepath.name}", shell=True)
+        if process.returncode != 0:
+            raise RuntimeError("Failed to take screenshot.")
         wait_until_file_exists(filepath)
     elif "niri" in currentDesktop:
         cmd = {
@@ -55,12 +57,15 @@ def take_screenshot(filepath: Path, typeStr: str):
         niriScreenshotPath = SCREENSHOT_DIR / ".niri_screenshot.png"
         if niriScreenshotPath.exists():
             niriScreenshotPath.unlink()
-        if os.system(cmd[type]):
+        # if os.system(cmd[type]):
+        process = subprocess.run(cmd[type], shell=True)
+        if process.returncode != 0:
             print("Failed to take screenshot.")
             exit(1)
         wait_until_file_exists(niriScreenshotPath)
         if niriScreenshotPath.exists():
-            niriScreenshotPath.rename(filepath)
+            # niriScreenshotPath.rename(filepath)
+            copy2(niriScreenshotPath, filepath)
         else:
             print("Failed to take screenshot.")
             exit(1)
@@ -71,7 +76,7 @@ def take_screenshot(filepath: Path, typeStr: str):
 
 
 def edit_screenshot(filepath: Path):
-    os.system(f"gradia {filepath}")
+    subprocess.run(f"gradia {filepath}", shell=True)
 
 
 def file_name(dir: Path, prefix="screenshot", ext=".png"):