diff --git a/src/main/events/catalogue/save-game-shop-assets.ts b/src/main/events/catalogue/save-game-shop-assets.ts
index 46aab36a..bf5f8b81 100644
--- a/src/main/events/catalogue/save-game-shop-assets.ts
+++ b/src/main/events/catalogue/save-game-shop-assets.ts
@@ -10,14 +10,15 @@ const saveGameShopAssets = async (
 ): Promise<void> => {
   const key = levelKeys.game(shop, objectId);
   const existingAssets = await gamesShopAssetsSublevel.get(key);
-  
+
   // Preserve existing title if it differs from the incoming title (indicating it was customized)
-  const shouldPreserveTitle = existingAssets?.title && existingAssets.title !== assets.title;
-  
-  return gamesShopAssetsSublevel.put(key, { 
-    ...existingAssets, 
+  const shouldPreserveTitle =
+    existingAssets?.title && existingAssets.title !== assets.title;
+
+  return gamesShopAssetsSublevel.put(key, {
+    ...existingAssets,
     ...assets,
-    title: shouldPreserveTitle ? existingAssets.title : assets.title
+    title: shouldPreserveTitle ? existingAssets.title : assets.title,
   });
 };
 
diff --git a/src/main/events/library/get-library.ts b/src/main/events/library/get-library.ts
index ea2971b9..6314f83d 100644
--- a/src/main/events/library/get-library.ts
+++ b/src/main/events/library/get-library.ts
@@ -24,7 +24,8 @@ const getLibrary = async (): Promise<LibraryGame[]> => {
               download: download ?? null,
               ...gameAssets,
               // Ensure compatibility with LibraryGame type
-              libraryHeroImageUrl: game.libraryHeroImageUrl ?? gameAssets?.libraryHeroImageUrl,
+              libraryHeroImageUrl:
+                game.libraryHeroImageUrl ?? gameAssets?.libraryHeroImageUrl,
             } as LibraryGame;
           })
       );
diff --git a/src/main/events/library/update-game-custom-assets.ts b/src/main/events/library/update-game-custom-assets.ts
index 99081a49..6049ef5d 100644
--- a/src/main/events/library/update-game-custom-assets.ts
+++ b/src/main/events/library/update-game-custom-assets.ts
@@ -21,9 +21,16 @@ const updateGameCustomAssets = async (
   const updatedGame = {
     ...existingGame,
     title,
-    customIconUrl: customIconUrl !== undefined ? customIconUrl : existingGame.customIconUrl,
-    customLogoImageUrl: customLogoImageUrl !== undefined ? customLogoImageUrl : existingGame.customLogoImageUrl,
-    customHeroImageUrl: customHeroImageUrl !== undefined ? customHeroImageUrl : existingGame.customHeroImageUrl,
+    customIconUrl:
+      customIconUrl !== undefined ? customIconUrl : existingGame.customIconUrl,
+    customLogoImageUrl:
+      customLogoImageUrl !== undefined
+        ? customLogoImageUrl
+        : existingGame.customLogoImageUrl,
+    customHeroImageUrl:
+      customHeroImageUrl !== undefined
+        ? customHeroImageUrl
+        : existingGame.customHeroImageUrl,
   };
 
   await gamesSublevel.put(gameKey, updatedGame);
@@ -42,4 +49,4 @@ const updateGameCustomAssets = async (
   return updatedGame;
 };
 
-registerEvent("updateGameCustomAssets", updateGameCustomAssets);
\ No newline at end of file
+registerEvent("updateGameCustomAssets", updateGameCustomAssets);
diff --git a/src/main/index.ts b/src/main/index.ts
index ab6980f9..9c390176 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -69,8 +69,9 @@ app.whenReady().then(async () => {
       request.url.slice("gradient:".length)
     );
 
+    // Fixed regex to prevent ReDoS - removed nested quantifiers and backtracking
     const match = gradientCss.match(
-      /linear-gradient\(([^,]+),\s*([^,]+),\s*([^)]+)\)/
+      /^linear-gradient\(([^,()]+),\s*([^,()]+),\s*([^,()]+)\)$/
     );
 
     let direction = "45deg";
diff --git a/src/renderer/src/pages/game-details/game-details-content.tsx b/src/renderer/src/pages/game-details/game-details-content.tsx
index cf300ceb..b8681c5c 100644
--- a/src/renderer/src/pages/game-details/game-details-content.tsx
+++ b/src/renderer/src/pages/game-details/game-details-content.tsx
@@ -120,7 +120,7 @@ export function GameDetailsContent() {
   }, [getGameArtifacts]);
 
   const isCustomGame = game?.shop === "custom";
-  
+
   // Helper function to get image with custom asset priority
   const getImageWithCustomPriority = (
     customUrl: string | null | undefined,
@@ -136,7 +136,7 @@ export function GameDetailsContent() {
         game?.customHeroImageUrl,
         shopDetails?.assets?.libraryHeroImageUrl
       );
-      
+
   const logoImage = isCustomGame
     ? game?.logoImageUrl || ""
     : getImageWithCustomPriority(
@@ -181,7 +181,11 @@ export function GameDetailsContent() {
                 <button
                   type="button"
                   className="game-details__edit-custom-game-button"
-                  onClick={game?.shop === "custom" ? handleEditCustomGameClick : handleEditGameClick}
+                  onClick={
+                    game?.shop === "custom"
+                      ? handleEditCustomGameClick
+                      : handleEditGameClick
+                  }
                   title={t("edit_custom_game")}
                 >
                   <PencilIcon size={16} />
diff --git a/src/renderer/src/pages/game-details/modals/edit-game-modal.scss b/src/renderer/src/pages/game-details/modals/edit-game-modal.scss
index f37ea44b..e596865e 100644
--- a/src/renderer/src/pages/game-details/modals/edit-game-modal.scss
+++ b/src/renderer/src/pages/game-details/modals/edit-game-modal.scss
@@ -44,4 +44,4 @@
 
 .edit-game-modal__actions button {
   min-width: 100px;
-}
\ No newline at end of file
+}
diff --git a/src/renderer/src/pages/game-details/modals/edit-game-modal.tsx b/src/renderer/src/pages/game-details/modals/edit-game-modal.tsx
index ff8e7c3c..b9e924c4 100644
--- a/src/renderer/src/pages/game-details/modals/edit-game-modal.tsx
+++ b/src/renderer/src/pages/game-details/modals/edit-game-modal.tsx
@@ -364,4 +364,4 @@ export function EditGameModal({
       </div>
     </Modal>
   );
-}
\ No newline at end of file
+}