diff --git a/src/renderer/src/components/toast/toast.scss b/src/renderer/src/components/toast/toast.scss
index 9f0d5c0d..faef6b35 100644
--- a/src/renderer/src/components/toast/toast.scss
+++ b/src/renderer/src/components/toast/toast.scss
@@ -46,7 +46,7 @@
   }
 }
 
-.toast__content {
+&__content {
   display: flex;
   gap: $spacing-unit * 2;
   padding: $spacing-unit * 2;
@@ -54,7 +54,7 @@
   align-items: center;
 }
 
-.toast__progress {
+&__progress {
   width: 100%;
   height: 5px;
 
@@ -67,21 +67,26 @@
   }
 }
 
-.toast__close-button {
+&__close-button {
   color: $body-color;
   cursor: pointer;
   padding: 0;
   margin: 0;
 }
 
-.toast__success-icon {
+&__icon-container {
+  display: flex;
+  gap: var(--spacing-unit);
+}
+
+&__success-icon {
   color: $success-color;
 }
 
-.toast__error-icon {
+&__error-icon {
   color: $danger-color;
 }
 
-.toast__warning-icon {
+&__warning-icon {
   color: $warning-color;
 }
diff --git a/src/renderer/src/components/toast/toast.tsx b/src/renderer/src/components/toast/toast.tsx
index e757ffc6..cada7372 100644
--- a/src/renderer/src/components/toast/toast.tsx
+++ b/src/renderer/src/components/toast/toast.tsx
@@ -83,7 +83,7 @@ export function Toast({ visible, message, type, onClose }: ToastProps) {
       })}
     >
       <div className="toast__content">
-        <div style={{ display: "flex", gap: `${SPACING_UNIT}px` }}>
+        <div className="toast__icon-container">
           {type === "success" && (
             <CheckCircleFillIcon className="toast__success-icon" />
           )}
diff --git a/src/renderer/src/pages/achievements/achievement-panel.tsx b/src/renderer/src/pages/achievements/achievement-panel.tsx
index 3752591b..56623cfd 100644
--- a/src/renderer/src/pages/achievements/achievement-panel.tsx
+++ b/src/renderer/src/pages/achievements/achievement-panel.tsx
@@ -36,7 +36,7 @@ export function AchievementPanel({ achievements }: AchievementPanelProps) {
         <button
           type="button"
           onClick={() => showHydraCloudModal("achievements-points")}
-          className={styles.link}
+          className="achievement-panel__link"
         >
           <small style={{ color: "#ffc107" }}>
             {t("how_to_earn_achievements_points")}
diff --git a/src/renderer/src/pages/achievements/achievements-content.tsx b/src/renderer/src/pages/achievements/achievements-content.tsx
index e744671b..5ee81cf3 100644
--- a/src/renderer/src/pages/achievements/achievements-content.tsx
+++ b/src/renderer/src/pages/achievements/achievements-content.tsx
@@ -142,20 +142,20 @@ export function AchievementsContent({
 
     setGameColor(backgroundColor);
   };
-const HERO_HEIGHT = 150;
+  const HERO_HEIGHT = 150;
 
-const onScroll: React.UIEventHandler<HTMLElement> = (event) => {
-  const heroHeight = heroRef.current?.clientHeight ?? HERO_HEIGHT;
+  const onScroll: React.UIEventHandler<HTMLElement> = (event) => {
+    const heroHeight = heroRef.current?.clientHeight ?? HERO_HEIGHT;
 
-  const scrollY = (event.target as HTMLDivElement).scrollTop;
-  if (scrollY >= heroHeight && !isHeaderStuck) {
-    setIsHeaderStuck(true);
-  }
+    const scrollY = (event.target as HTMLDivElement).scrollTop;
+    if (scrollY >= heroHeight && !isHeaderStuck) {
+      setIsHeaderStuck(true);
+    }
 
-  if (scrollY <= heroHeight && isHeaderStuck) {
-    setIsHeaderStuck(false);
-  }
-};
+    if (scrollY <= heroHeight && isHeaderStuck) {
+      setIsHeaderStuck(false);
+    }
+  };
 
   const getProfileImage = (
     user: Pick<UserInfo, "profileImageUrl" | "displayName">
@@ -269,4 +269,4 @@ const onScroll: React.UIEventHandler<HTMLElement> = (event) => {
       </section>
     </div>
   );
-}
\ No newline at end of file
+}
diff --git a/src/renderer/src/pages/achievements/compared-achievement-panel.tsx b/src/renderer/src/pages/achievements/compared-achievement-panel.tsx
index 8eba2b60..73819a17 100644
--- a/src/renderer/src/pages/achievements/compared-achievement-panel.tsx
+++ b/src/renderer/src/pages/achievements/compared-achievement-panel.tsx
@@ -1,11 +1,12 @@
 import { useTranslation } from "react-i18next";
-import * as styles from "./achievement-panel.css";
 
 import HydraIcon from "@renderer/assets/icons/hydra.svg?react";
 import { ComparedAchievements } from "@types";
-import { SPACING_UNIT } from "@renderer/theme.css";
 import { useUserDetails } from "@renderer/hooks";
 
+import "./achievement-panel.scss";
+import "../../scss/_variables.scss";
+
 export interface ComparedAchievementPanelProps {
   achievements: ComparedAchievements;
 }
@@ -18,27 +19,27 @@ export function ComparedAchievementPanel({
 
   return (
     <div
-      className={styles.panel}
-      style={{
-        display: "grid",
-        gridTemplateColumns: hasActiveSubscription ? "3fr 1fr 1fr" : "3fr 2fr",
-        gap: `${SPACING_UNIT * 2}px`,
-      }}
+      className={classNames("achievement-panel", {
+        "achievement-panel--subscribed": hasActiveSubscription,
+      })}
     >
-      <div style={{ display: "flex", gap: `${SPACING_UNIT}px` }}>
-        {t("available_points")} <HydraIcon width={20} height={20} />{" "}
+      <div className="achievement-panel__points">
+        {t("available_points")}
+        <HydraIcon width={20} height={20} />
         {achievements.achievementsPointsTotal}
       </div>
+
       {hasActiveSubscription && (
-        <div className={styles.content}>
+        <div className="achievement-panel__content">
           <HydraIcon width={20} height={20} />
           {achievements.owner.achievementsPointsEarnedSum ?? 0}
         </div>
       )}
-      <div className={styles.content}>
+
+      <div className="achievement-panel__content">
         <HydraIcon width={20} height={20} />
         {achievements.target.achievementsPointsEarnedSum}
       </div>
     </div>
   );
-}
+}
\ No newline at end of file
diff --git a/src/renderer/src/pages/catalogue/catalogue.scss b/src/renderer/src/pages/catalogue/catalogue.scss
index 74b55215..5b3471cb 100644
--- a/src/renderer/src/pages/catalogue/catalogue.scss
+++ b/src/renderer/src/pages/catalogue/catalogue.scss
@@ -20,7 +20,7 @@
     align-self: flex-start;
   }
 
-    &__header {
+  &__header {
     display: flex;
     gap: calc(var(--spacing-unit) * 2);
     justify-content: space-between;
diff --git a/src/renderer/src/pages/downloads/download-group.scss b/src/renderer/src/pages/downloads/download-group.scss
index c43b181b..6eceb7f0 100644
--- a/src/renderer/src/pages/downloads/download-group.scss
+++ b/src/renderer/src/pages/downloads/download-group.scss
@@ -21,6 +21,13 @@
     }
   }
 
+  &__downloads-group {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: $spacing-unit * 2;
+  }
+
   &__downloads {
     width: 100%;
     gap: #{$spacing-unit * 2};
diff --git a/src/renderer/src/pages/downloads/download-group.tsx b/src/renderer/src/pages/downloads/download-group.tsx
index 851fff26..12c4d0b4 100644
--- a/src/renderer/src/pages/downloads/download-group.tsx
+++ b/src/renderer/src/pages/downloads/download-group.tsx
@@ -13,9 +13,9 @@ import { DOWNLOADER_NAME } from "@renderer/constants";
 import { useAppSelector, useDownload } from "@renderer/hooks";
 
 import "./download-group.scss";
+import "../../scss/_variables.scss";
 
 import { useTranslation } from "react-i18next";
-import { SPACING_UNIT, vars } from "@renderer/theme.css";
 import { useMemo } from "react";
 import {
   DropdownMenu,
@@ -240,20 +240,14 @@ export function DownloadGroup({
 
   return (
     <div className="download-group">
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "space-between",
-          gap: `${SPACING_UNIT * 2}px`,
-        }}
+      <div className="download-group__downloads-group"
       >
         <h2>{title}</h2>
 
         <div
           style={{
             flex: 1,
-            backgroundColor: vars.color.border,
+            backgroundColor: "var(--border-color)",
             height: "1px",
           }}
         />
@@ -272,7 +266,7 @@ export function DownloadGroup({
                 <div className="download-group__cover-backdrop">
                   <img
                     src={steamUrlBuilder.library(game.objectID)}
-                    className={styles.downloadCoverImage}
+                    className="download-group__cover-image"
                     alt={game.title}
                   />
 
diff --git a/src/renderer/src/pages/game-details/description-header/description-header.tsx b/src/renderer/src/pages/game-details/description-header/description-header.tsx
index cd73c52a..0d237607 100644
--- a/src/renderer/src/pages/game-details/description-header/description-header.tsx
+++ b/src/renderer/src/pages/game-details/description-header/description-header.tsx
@@ -12,8 +12,8 @@ export function DescriptionHeader() {
   if (!shopDetails) return null;
 
   return (
-    <div className={styles.descriptionHeader}>
-      <section className={styles.descriptionHeaderInfo}>
+    <div className="description-header">
+      <section className="description-header__info">
         <p>
           {t("release_date", {
             date: shopDetails?.release_date.date,
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 016af036..386b0e35 100644
--- a/src/renderer/src/pages/game-details/game-details-content.tsx
+++ b/src/renderer/src/pages/game-details/game-details-content.tsx
@@ -25,13 +25,8 @@ export function GameDetailsContent() {
 
   const { t } = useTranslation("game_details");
 
-  const {
-    objectId,
-    shopDetails,
-    game,
-    gameColor,
-    setGameColor,
-  } = useContext(gameDetailsContext);
+  const { objectId, shopDetails, game, gameColor, setGameColor } =
+    useContext(gameDetailsContext);
 
   const { showHydraCloudModal } = useSubscription();
 
@@ -77,27 +72,27 @@ export function GameDetailsContent() {
   useEffect(() => {
     setBackdropOpacity(1);
   }, [objectId]);
-  const HERO_HEIGHT = 150; 
+  const HERO_HEIGHT = 150;
 
   const onScroll: React.UIEventHandler<HTMLElement> = (event) => {
-  const heroHeight = heroRef.current?.clientHeight ?? HERO_HEIGHT;
+    const heroHeight = heroRef.current?.clientHeight ?? HERO_HEIGHT;
 
-  const scrollY = (event.target as HTMLDivElement).scrollTop;
-  const opacity = Math.max(
-    0,
-    1 - scrollY / (heroHeight - HERO_ANIMATION_THRESHOLD)
-  );
+    const scrollY = (event.target as HTMLDivElement).scrollTop;
+    const opacity = Math.max(
+      0,
+      1 - scrollY / (heroHeight - HERO_ANIMATION_THRESHOLD)
+    );
 
-  if (scrollY >= heroHeight && !isHeaderStuck) {
-    setIsHeaderStuck(true);
-  }
+    if (scrollY >= heroHeight && !isHeaderStuck) {
+      setIsHeaderStuck(true);
+    }
 
-  if (scrollY <= heroHeight && isHeaderStuck) {
-    setIsHeaderStuck(false);
-  }
+    if (scrollY <= heroHeight && isHeaderStuck) {
+      setIsHeaderStuck(false);
+    }
 
-  setBackdropOpacity(opacity);
-};
+    setBackdropOpacity(opacity);
+  };
 
   const handleCloudSaveButtonClick = () => {
     if (!userDetails) {