diff --git a/src/main/events/achievements/upload-achievement-image.ts b/src/main/events/achievements/upload-achievement-image.ts
index bb2647b3..a050b941 100644
--- a/src/main/events/achievements/upload-achievement-image.ts
+++ b/src/main/events/achievements/upload-achievement-image.ts
@@ -1,5 +1,5 @@
-import fs from "fs";
-import path from "path";
+import fs from "node:fs";
+import path from "node:path";
 import axios from "axios";
 import { fileTypeFromFile } from "file-type";
 import { HydraApi } from "@main/services/hydra-api";
diff --git a/src/main/services/screenshot.ts b/src/main/services/screenshot.ts
index dfbf0917..7f1a2cc9 100644
--- a/src/main/services/screenshot.ts
+++ b/src/main/services/screenshot.ts
@@ -1,7 +1,6 @@
-import { desktopCapturer, nativeImage } from "electron";
+import { desktopCapturer, nativeImage, app } from "electron";
 import fs from "node:fs";
 import path from "node:path";
-import { app } from "electron";
 import { logger } from "./logger";
 
 export class ScreenshotService {
@@ -66,11 +65,11 @@ export class ScreenshotService {
       let filename: string;
 
       if (gameTitle && achievementName) {
-        const sanitizedGameTitle = gameTitle.replace(/[<>:"/\\|?*]/g, "_");
+        const sanitizedGameTitle = gameTitle.replaceAll(/[<>:"/\\|?*]/g, "_");
         const gameDir = path.join(screenshotsDir, sanitizedGameTitle);
         finalDir = gameDir;
 
-        const sanitizedAchievementName = achievementName.replace(
+        const sanitizedAchievementName = achievementName.replaceAll(
           /[<>:"/\\|?*]/g,
           "_"
         );
diff --git a/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx b/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx
index d4796083..d2d40960 100644
--- a/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx
+++ b/src/renderer/src/components/fullscreen-image-modal/fullscreen-image-modal.tsx
@@ -14,7 +14,7 @@ export function FullscreenImageModal({
   imageUrl,
   imageAlt,
   onClose,
-}: FullscreenImageModalProps) {
+}: Readonly<FullscreenImageModalProps>) {
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (event.key === "Escape") {
@@ -36,11 +36,10 @@ export function FullscreenImageModal({
   if (!isOpen) return null;
 
   return (
-    <div
+    <dialog
       className="fullscreen-image-modal"
-      role="dialog"
       aria-modal="true"
-      tabIndex={-1}
+      open
     >
       <button
         type="button"
@@ -66,6 +65,6 @@ export function FullscreenImageModal({
           />
         </div>
       </div>
-    </div>
+    </dialog>
   );
 }
diff --git a/src/renderer/src/pages/achievements/achievement-list.tsx b/src/renderer/src/pages/achievements/achievement-list.tsx
index 2975beeb..4ba499f1 100644
--- a/src/renderer/src/pages/achievements/achievement-list.tsx
+++ b/src/renderer/src/pages/achievements/achievement-list.tsx
@@ -71,7 +71,7 @@ export function AchievementList({
                     className="achievements__item-image-button"
                     onClick={() =>
                       handleImageClick(
-                        achievement.achievementImageUrl!,
+                        achievement.achievementImageUrl,
                         achievement.displayName
                       )
                     }
diff --git a/src/renderer/src/pages/profile/profile-content/profile-content.tsx b/src/renderer/src/pages/profile/profile-content/profile-content.tsx
index b9525760..45aedeaf 100644
--- a/src/renderer/src/pages/profile/profile-content/profile-content.tsx
+++ b/src/renderer/src/pages/profile/profile-content/profile-content.tsx
@@ -230,7 +230,7 @@ export function ProfileContent() {
                                 className="profile-content__souvenir-image-button"
                                 onClick={() =>
                                   handleImageClick(
-                                    achievement.achievementImageUrl!,
+                                    achievement.achievementImageUrl,
                                     achievement.name
                                   )
                                 }