diff --git a/backend/__tests__/__integration__/services/weekly-xp-leaderboard.spec.ts b/backend/__tests__/__integration__/services/weekly-xp-leaderboard.spec.ts
index 1b572b3341d2..970f38143ca9 100644
--- a/backend/__tests__/__integration__/services/weekly-xp-leaderboard.spec.ts
+++ b/backend/__tests__/__integration__/services/weekly-xp-leaderboard.spec.ts
@@ -48,22 +48,25 @@ describe("Weekly XP Leaderboards", () => {
         const results = await lb.getResults(0, 10, leaderboardsConfig, true);
 
         //THEN
-        expect(results).toEqual([
-          {
-            ...user1,
-            rank: 1,
-            timeTypedSeconds: 10,
-            totalXp: 150,
-            isPremium: false,
-          },
-          {
-            ...user2,
-            rank: 2,
-            timeTypedSeconds: 7,
-            totalXp: 100,
-            isPremium: true,
-          },
-        ]);
+        expect(results).toEqual({
+          count: 2,
+          entries: [
+            {
+              ...user1,
+              rank: 1,
+              timeTypedSeconds: 10,
+              totalXp: 150,
+              isPremium: false,
+            },
+            {
+              ...user2,
+              rank: 2,
+              timeTypedSeconds: 7,
+              totalXp: 100,
+              isPremium: true,
+            },
+          ],
+        });
       });
     });
 
@@ -77,10 +80,13 @@ describe("Weekly XP Leaderboards", () => {
         const results = await lb.getResults(0, 10, leaderboardsConfig, true);
 
         //THEN
-        expect(results).toEqual([
-          { rank: 1, totalXp: 150, ...user1 },
-          { rank: 2, totalXp: 100, ...user2 },
-        ]);
+        expect(results).toEqual({
+          count: 2,
+          entries: [
+            { rank: 1, totalXp: 150, ...user1 },
+            { rank: 2, totalXp: 100, ...user2 },
+          ],
+        });
       });
 
       it("gets results for page", async () => {
@@ -94,10 +100,13 @@ describe("Weekly XP Leaderboards", () => {
         const results = await lb.getResults(1, 2, leaderboardsConfig, true);
 
         //THEN
-        expect(results).toEqual([
-          { rank: 3, totalXp: 50, ...user3 },
-          { rank: 4, totalXp: 25, ...user4 },
-        ]);
+        expect(results).toEqual({
+          count: 4,
+          entries: [
+            { rank: 3, totalXp: 50, ...user3 },
+            { rank: 4, totalXp: 25, ...user4 },
+          ],
+        });
       });
 
       it("gets results without premium", async () => {
@@ -109,10 +118,73 @@ describe("Weekly XP Leaderboards", () => {
         const results = await lb.getResults(0, 10, leaderboardsConfig, false);
 
         //THEN
-        expect(results).toEqual([
-          { rank: 1, totalXp: 150, ...user1, isPremium: undefined },
-          { rank: 2, totalXp: 100, ...user2, isPremium: undefined },
+        expect(results).toEqual({
+          count: 2,
+          entries: [
+            { rank: 1, totalXp: 150, ...user1, isPremium: undefined },
+            { rank: 2, totalXp: 100, ...user2, isPremium: undefined },
+          ],
+        });
+      });
+
+      it("gets results for friends only", async () => {
+        //GIVEN
+        const _user1 = await givenResult(100);
+        const user2 = await givenResult(75);
+        const _user3 = await givenResult(50);
+        const user4 = await givenResult(25);
+
+        //WHEN
+        const results = await lb.getResults(0, 5, leaderboardsConfig, true, [
+          user2.uid,
+          user4.uid,
+          new ObjectId().toHexString(),
+        ]);
+
+        //THEN
+        expect(results).toEqual({
+          count: 2,
+          entries: [
+            { rank: 2, friendsRank: 1, totalXp: 75, ...user2 },
+            { rank: 4, friendsRank: 2, totalXp: 25, ...user4 },
+          ],
+        });
+      });
+
+      it("gets results for friends only with page", async () => {
+        //GIVEN
+        const user1 = await givenResult(100);
+        const user2 = await givenResult(75);
+        const _user3 = await givenResult(50);
+        const user4 = await givenResult(25);
+        const _user5 = await givenResult(5);
+
+        //WHEN
+        const results = await lb.getResults(1, 2, leaderboardsConfig, true, [
+          user1.uid,
+          user2.uid,
+          user4.uid,
+          new ObjectId().toHexString(),
         ]);
+
+        //THEN
+        expect(results).toEqual({
+          count: 3,
+          entries: [{ rank: 4, friendsRank: 3, totalXp: 25, ...user4 }],
+        });
+      });
+
+      it("should return empty list if no friends", async () => {
+        //GIVEN
+
+        //WHEN
+        const results = await lb.getResults(0, 5, leaderboardsConfig, true, []);
+
+        //THEN
+        expect(results).toEqual({
+          count: 0,
+          entries: [],
+        });
       });
     });
 
@@ -127,18 +199,30 @@ describe("Weekly XP Leaderboards", () => {
         //THEN
         expect(rank).toEqual({ rank: 2, totalXp: 100, ...user1 });
       });
-    });
 
-    describe("getCount", () => {
-      it("gets count", async () => {
+      it("should return null for unknown user", async () => {
+        expect(await lb.getRank("decoy", leaderboardsConfig)).toBeNull();
+        expect(
+          await lb.getRank("decoy", leaderboardsConfig, ["unknown", "unknown2"])
+        ).toBeNull();
+      });
+
+      it("gets rank for friends", async () => {
         //GIVEN
-        await givenResult(100);
-        await givenResult(150);
+        const user1 = await givenResult(50);
+        const user2 = await givenResult(60);
+        const _user3 = await givenResult(70);
 
-        //WHEN
-        const count = await lb.getCount();
-        //THEN
-        expect(count).toEqual(2);
+        const friends = [user1.uid, user2.uid, "decoy"];
+
+        //WHEN / THEN
+        expect(
+          await lb.getRank(user2.uid, leaderboardsConfig, friends)
+        ).toEqual({ rank: 2, friendsRank: 1, totalXp: 60, ...user2 });
+
+        expect(
+          await lb.getRank(user1.uid, leaderboardsConfig, friends)
+        ).toEqual({ rank: 3, friendsRank: 2, totalXp: 50, ...user1 });
       });
     });
 
@@ -154,9 +238,10 @@ describe("Weekly XP Leaderboards", () => {
       );
       //THEN
       expect(await lb.getRank(cheater.uid, leaderboardsConfig)).toBeNull();
-      expect(await lb.getResults(0, 50, leaderboardsConfig, true)).toEqual([
-        { rank: 1, totalXp: 1000, ...validUser },
-      ]);
+      expect(await lb.getResults(0, 50, leaderboardsConfig, true)).toEqual({
+        count: 1,
+        entries: [{ rank: 1, totalXp: 1000, ...validUser }],
+      });
     });
 
     async function givenResult(
diff --git a/backend/__tests__/__integration__/utils/daily-leaderboards.spec.ts b/backend/__tests__/__integration__/utils/daily-leaderboards.spec.ts
index 7f5a7efdbe87..8cd725566248 100644
--- a/backend/__tests__/__integration__/utils/daily-leaderboards.spec.ts
+++ b/backend/__tests__/__integration__/utils/daily-leaderboards.spec.ts
@@ -120,10 +120,14 @@ describe("Daily Leaderboards", () => {
           true
         );
         //THEN
-        expect(results).toEqual([
-          { rank: 1, ...bestResult },
-          { rank: 2, ...user2 },
-        ]);
+        expect(results).toEqual({
+          count: 2,
+          minWpm: 20,
+          entries: [
+            { rank: 1, ...bestResult },
+            { rank: 2, ...user2 },
+          ],
+        });
       });
 
       it("limits max amount of results", async () => {
@@ -136,7 +140,10 @@ describe("Daily Leaderboards", () => {
             .fill(0)
             .map(() => givenResult({ wpm: 20 + Math.random() * 100 }))
         );
-        expect(await lb.getCount()).toEqual(maxResults);
+        expect(
+          await lb.getResults(0, 5, dailyLeaderboardsConfig, true)
+        ).toEqual(expect.objectContaining({ count: maxResults }));
+
         expect(await lb.getRank(bob.uid, dailyLeaderboardsConfig)).toEqual({
           rank: maxResults,
           ...bob,
@@ -147,7 +154,9 @@ describe("Daily Leaderboards", () => {
 
         //THEN
         //max count is still the same, but bob is no longer on the leaderboard
-        expect(await lb.getCount()).toEqual(maxResults);
+        expect(
+          await lb.getResults(0, 5, dailyLeaderboardsConfig, true)
+        ).toEqual(expect.objectContaining({ count: maxResults }));
         expect(await lb.getRank(bob.uid, dailyLeaderboardsConfig)).toBeNull();
       });
     });
@@ -166,11 +175,15 @@ describe("Daily Leaderboards", () => {
           true
         );
         //THEN
-        expect(results).toEqual([
-          { rank: 1, ...user2 },
-          { rank: 2, ...user1 },
-          { rank: 3, ...user3 },
-        ]);
+        expect(results).toEqual({
+          count: 3,
+          minWpm: 40,
+          entries: [
+            { rank: 1, ...user2 },
+            { rank: 2, ...user1 },
+            { rank: 3, ...user3 },
+          ],
+        });
       });
       it("gets result for page", async () => {
         //GIVEN
@@ -188,10 +201,14 @@ describe("Daily Leaderboards", () => {
           true
         );
         //THEN
-        expect(results).toEqual([
-          { rank: 3, ...user4 },
-          { rank: 4, ...user3 },
-        ]);
+        expect(results).toEqual({
+          count: 5,
+          minWpm: 20,
+          entries: [
+            { rank: 3, ...user4 },
+            { rank: 4, ...user3 },
+          ],
+        });
       });
 
       it("gets result without premium", async () => {
@@ -208,57 +225,140 @@ describe("Daily Leaderboards", () => {
           false
         );
         //THEN
-        expect(results).toEqual([
-          { rank: 1, ...user2, isPremium: undefined },
-          { rank: 2, ...user1, isPremium: undefined },
-          { rank: 3, ...user3, isPremium: undefined },
-        ]);
+        expect(results).toEqual({
+          count: 3,
+          minWpm: 40,
+          entries: [
+            { rank: 1, ...user2, isPremium: undefined },
+            { rank: 2, ...user1, isPremium: undefined },
+            { rank: 3, ...user3, isPremium: undefined },
+          ],
+        });
       });
-    });
 
-    describe("minWPm", () => {
-      it("gets min wpm", async () => {
+      it("should get for friends only", async () => {
         //GIVEN
-        await givenResult({ wpm: 50 });
-        await givenResult({ wpm: 60 });
+        const _user1 = await givenResult({ wpm: 90 });
+        const user2 = await givenResult({ wpm: 80 });
+        const _user3 = await givenResult({ wpm: 70 });
+        const user4 = await givenResult({ wpm: 60 });
+        const _user5 = await givenResult({ wpm: 50 });
 
         //WHEN
-        const minWpm = await lb.getMinWpm(dailyLeaderboardsConfig);
+        const results = await lb.getResults(
+          0,
+          5,
+          dailyLeaderboardsConfig,
+          true,
+          [user2.uid, user4.uid, new ObjectId().toHexString()]
+        );
         //THEN
-        expect(minWpm).toEqual(50);
+        expect(results).toEqual({
+          count: 2,
+          minWpm: 60,
+          entries: [
+            { rank: 2, friendsRank: 1, ...user2 },
+            { rank: 4, friendsRank: 2, ...user4 },
+          ],
+        });
       });
-    });
 
-    describe("getRank", () => {
-      it("gets rank", async () => {
+      it("should get for friends only with page", async () => {
         //GIVEN
-        const user1 = await givenResult({ wpm: 50 });
-        const _user2 = await givenResult({ wpm: 60 });
+        const user1 = await givenResult({ wpm: 105 });
+        const user2 = await givenResult({ wpm: 100 });
+        const _user3 = await givenResult({ wpm: 95 });
+        const user4 = await givenResult({ wpm: 90 });
+        const _user5 = await givenResult({ wpm: 70 });
 
         //WHEN
-        const rank = await lb.getRank(user1.uid, dailyLeaderboardsConfig);
+
+        const results = await lb.getResults(
+          1,
+          2,
+          dailyLeaderboardsConfig,
+          true,
+          [user1.uid, user2.uid, user4.uid, new ObjectId().toHexString()]
+        );
+
         //THEN
-        expect(rank).toEqual({ rank: 2, ...user1 });
+        expect(results).toEqual({
+          count: 3,
+          minWpm: 90,
+          entries: [{ rank: 4, friendsRank: 3, ...user4 }],
+        });
       });
-    });
 
-    describe("getCount", () => {
-      it("gets count", async () => {
+      it("should return empty list if no friends", async () => {
         //GIVEN
-        await givenResult({ wpm: 50 });
-        await givenResult({ wpm: 60 });
 
         //WHEN
-        const count = await lb.getCount();
+        const results = await lb.getResults(
+          0,
+          5,
+          dailyLeaderboardsConfig,
+          true,
+          []
+        );
         //THEN
-        expect(count).toEqual(2);
+        expect(results).toEqual({
+          count: 0,
+          minWpm: 0,
+          entries: [],
+        });
+      });
+    });
+
+    describe("getRank", () => {
+      it("gets rank", async () => {
+        //GIVEN
+        const user1 = await givenResult({ wpm: 50 });
+        const user2 = await givenResult({ wpm: 60 });
+
+        //WHEN / THEN
+        expect(await lb.getRank(user1.uid, dailyLeaderboardsConfig)).toEqual({
+          rank: 2,
+          ...user1,
+        });
+        expect(await lb.getRank(user2.uid, dailyLeaderboardsConfig)).toEqual({
+          rank: 1,
+          ...user2,
+        });
+      });
+
+      it("should return null for unknown user", async () => {
+        expect(await lb.getRank("decoy", dailyLeaderboardsConfig)).toBeNull();
+        expect(
+          await lb.getRank("decoy", dailyLeaderboardsConfig, [
+            "unknown",
+            "unknown2",
+          ])
+        ).toBeNull();
+      });
+
+      it("gets rank for friends", async () => {
+        //GIVEN
+        const user1 = await givenResult({ wpm: 50 });
+        const user2 = await givenResult({ wpm: 60 });
+        const _user3 = await givenResult({ wpm: 70 });
+        const friends = [user1.uid, user2.uid, "decoy"];
+
+        //WHEN / THEN
+        expect(
+          await lb.getRank(user2.uid, dailyLeaderboardsConfig, friends)
+        ).toEqual({ rank: 2, friendsRank: 1, ...user2 });
+
+        expect(
+          await lb.getRank(user1.uid, dailyLeaderboardsConfig, friends)
+        ).toEqual({ rank: 3, friendsRank: 2, ...user1 });
       });
     });
 
     it("purgeUserFromDailyLeaderboards", async () => {
       //GIVEN
       const cheater = await givenResult({ wpm: 50 });
-      const validUser = await givenResult();
+      const user1 = await givenResult({ wpm: 60 });
+      const user2 = await givenResult({ wpm: 40 });
 
       //WHEN
       await DailyLeaderboards.purgeUserFromDailyLeaderboards(
@@ -268,7 +368,14 @@ describe("Daily Leaderboards", () => {
       //THEN
       expect(await lb.getRank(cheater.uid, dailyLeaderboardsConfig)).toBeNull();
       expect(await lb.getResults(0, 50, dailyLeaderboardsConfig, true)).toEqual(
-        [{ rank: 1, ...validUser }]
+        {
+          count: 2,
+          minWpm: 40,
+          entries: [
+            { rank: 1, ...user1 },
+            { rank: 2, ...user2 },
+          ],
+        }
       );
     });
 
diff --git a/backend/__tests__/api/controllers/leaderboard.spec.ts b/backend/__tests__/api/controllers/leaderboard.spec.ts
index e80f0de60bcd..d06b906f33cb 100644
--- a/backend/__tests__/api/controllers/leaderboard.spec.ts
+++ b/backend/__tests__/api/controllers/leaderboard.spec.ts
@@ -477,18 +477,22 @@ describe("Loaderboard Controller", () => {
       DailyLeaderboards,
       "getDailyLeaderboard"
     );
+    const getFriendsUidsMock = vi.spyOn(ConnectionsDal, "getFriendsUids");
+    const getResultMock = vi.fn();
 
     beforeEach(async () => {
-      getDailyLeaderboardMock.mockClear();
+      [getDailyLeaderboardMock, getFriendsUidsMock, getResultMock].forEach(
+        (it) => it.mockClear()
+      );
       vi.useFakeTimers();
       vi.setSystemTime(1722606812000);
       await dailyLeaderboardEnabled(true);
 
       getDailyLeaderboardMock.mockReturnValue({
-        getResults: () => Promise.resolve([]),
-        getCount: () => Promise.resolve(0),
-        getMinWpm: () => Promise.resolve(0),
+        getResults: getResultMock,
       } as any);
+
+      getResultMock.mockResolvedValue(null);
     });
 
     afterEach(() => {
@@ -528,20 +532,11 @@ describe("Loaderboard Controller", () => {
         ],
       };
 
-      const getResultMock = vi.fn();
-      getResultMock.mockResolvedValue(resultData);
-
-      const getCountMock = vi.fn();
-      getCountMock.mockResolvedValue(2);
-
-      const getMinWpmMock = vi.fn();
-      getMinWpmMock.mockResolvedValue(10);
-
-      getDailyLeaderboardMock.mockReturnValue({
-        getResults: getResultMock,
-        getCount: getCountMock,
-        getMinWpm: getMinWpmMock,
-      } as any);
+      getResultMock.mockResolvedValue({
+        count: 2,
+        minWpm: 10,
+        entries: resultData,
+      });
 
       //WHEN
       const { body } = await mockApp
@@ -568,7 +563,13 @@ describe("Loaderboard Controller", () => {
         -1
       );
 
-      expect(getResultMock).toHaveBeenCalledWith(0, 50, lbConf, premiumEnabled);
+      expect(getResultMock).toHaveBeenCalledWith(
+        0,
+        50,
+        lbConf,
+        premiumEnabled,
+        undefined
+      );
     });
 
     it("should get for english time 60 for yesterday", async () => {
@@ -612,20 +613,7 @@ describe("Loaderboard Controller", () => {
       const page = 2;
       const pageSize = 25;
 
-      const getResultMock = vi.fn();
-      getResultMock.mockResolvedValue([]);
-
-      const getCountMock = vi.fn();
-      getCountMock.mockResolvedValue(0);
-
-      const getMinWpmMock = vi.fn();
-      getMinWpmMock.mockResolvedValue(0);
-
-      getDailyLeaderboardMock.mockReturnValue({
-        getResults: getResultMock,
-        getCount: getCountMock,
-        getMinWpm: getMinWpmMock,
-      } as any);
+      getResultMock.mockResolvedValue({ entries: [] });
 
       //WHEN
       const { body } = await mockApp
@@ -662,7 +650,50 @@ describe("Loaderboard Controller", () => {
         page,
         pageSize,
         lbConf,
-        premiumEnabled
+        premiumEnabled,
+        undefined
+      );
+    });
+
+    it("should get for friends", async () => {
+      //GIVEN
+      const lbConf = (await configuration).dailyLeaderboards;
+      const premiumEnabled = (await configuration).users.premium.enabled;
+      await enableConnectionsFeature(true);
+      const friends = [
+        new ObjectId().toHexString(),
+        new ObjectId().toHexString(),
+      ];
+      getFriendsUidsMock.mockResolvedValue(friends);
+
+      //WHEN
+      await mockApp
+        .get("/leaderboards/daily")
+        .set("Authorization", `Bearer ${uid}`)
+        .query({
+          language: "english",
+          mode: "time",
+          mode2: "60",
+          friendsOnly: true,
+        })
+        .expect(200);
+
+      //THEN
+
+      expect(getDailyLeaderboardMock).toHaveBeenCalledWith(
+        "english",
+        "time",
+        "60",
+        lbConf,
+        -1
+      );
+
+      expect(getResultMock).toHaveBeenCalledWith(
+        0,
+        50,
+        lbConf,
+        premiumEnabled,
+        friends
       );
     });
 
@@ -711,6 +742,7 @@ describe("Loaderboard Controller", () => {
         expect(response.status, "for mode2 " + mode2).toEqual(200);
       }
     });
+
     it("fails for missing query", async () => {
       const { body } = await mockApp.get("/leaderboards").expect(422);
 
@@ -723,6 +755,7 @@ describe("Loaderboard Controller", () => {
         ],
       });
     });
+
     it("fails for invalid query", async () => {
       const { body } = await mockApp
         .get("/leaderboards/daily")
@@ -783,16 +816,21 @@ describe("Loaderboard Controller", () => {
       DailyLeaderboards,
       "getDailyLeaderboard"
     );
+    const getRankMock = vi.fn();
+    const getFriendsUidsMock = vi.spyOn(ConnectionsDal, "getFriendsUids");
 
     beforeEach(async () => {
-      getDailyLeaderboardMock.mockClear();
-      vi.useFakeTimers();
-      vi.setSystemTime(1722606812000);
-      await dailyLeaderboardEnabled(true);
+      [getDailyLeaderboardMock, getRankMock, getFriendsUidsMock].forEach((it) =>
+        it.mockClear()
+      );
 
       getDailyLeaderboardMock.mockReturnValue({
-        getRank: () => Promise.resolve({} as any),
+        getRank: getRankMock,
       } as any);
+
+      vi.useFakeTimers();
+      vi.setSystemTime(1722606812000);
+      await dailyLeaderboardEnabled(true);
     });
 
     afterEach(() => {
@@ -825,11 +863,7 @@ describe("Loaderboard Controller", () => {
         },
       };
 
-      const getRankMock = vi.fn();
       getRankMock.mockResolvedValue(rankData);
-      getDailyLeaderboardMock.mockReturnValue({
-        getRank: getRankMock,
-      } as any);
 
       //WHEN
       const { body } = await mockApp
@@ -852,8 +886,43 @@ describe("Loaderboard Controller", () => {
         -1
       );
 
-      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf);
+      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf, undefined);
     });
+
+    it("should get for english time 60 friends only", async () => {
+      //GIVEN
+      await enableConnectionsFeature(true);
+      const lbConf = (await configuration).dailyLeaderboards;
+      getRankMock.mockResolvedValue({});
+      const friends = ["friendOne", "friendTwo"];
+      getFriendsUidsMock.mockResolvedValue(friends);
+
+      //WHEN
+      await mockApp
+        .get("/leaderboards/daily/rank")
+        .set("Authorization", `Bearer ${uid}`)
+        .query({
+          language: "english",
+          mode: "time",
+          mode2: "60",
+          friendsOnly: true,
+        })
+        .expect(200);
+
+      //THEN
+
+      expect(getDailyLeaderboardMock).toHaveBeenCalledWith(
+        "english",
+        "time",
+        "60",
+        lbConf,
+        -1
+      );
+
+      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf, friends);
+      expect(getFriendsUidsMock).toHaveBeenCalledWith(uid);
+    });
+
     it("fails if daily leaderboards are disabled", async () => {
       await dailyLeaderboardEnabled(false);
 
@@ -866,6 +935,7 @@ describe("Loaderboard Controller", () => {
         "Daily leaderboards are not available at this time."
       );
     });
+
     it("should get for mode", async () => {
       for (const mode of ["time", "words", "quote", "zen", "custom"]) {
         const response = await mockApp
@@ -875,6 +945,7 @@ describe("Loaderboard Controller", () => {
         expect(response.status, "for mode " + mode).toEqual(200);
       }
     });
+
     it("should get for mode2", async () => {
       for (const mode2 of allModes) {
         const response = await mockApp
@@ -885,6 +956,7 @@ describe("Loaderboard Controller", () => {
         expect(response.status, "for mode2 " + mode2).toEqual(200);
       }
     });
+
     it("fails for missing query", async () => {
       const { body } = await mockApp
         .get("/leaderboards/daily/rank")
@@ -900,6 +972,7 @@ describe("Loaderboard Controller", () => {
         ],
       });
     });
+
     it("fails for invalid query", async () => {
       const { body } = await mockApp
         .get("/leaderboards/daily/rank")
@@ -920,6 +993,7 @@ describe("Loaderboard Controller", () => {
         ],
       });
     });
+
     it("fails for unknown query", async () => {
       const { body } = await mockApp
         .get("/leaderboards/daily/rank")
@@ -937,6 +1011,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: ["Unrecognized key(s) in object: 'extra'"],
       });
     });
+
     it("fails while leaderboard is missing", async () => {
       //GIVEN
       getDailyLeaderboardMock.mockReturnValue(null);
@@ -960,17 +1035,22 @@ describe("Loaderboard Controller", () => {
 
   describe("get xp weekly leaderboard", () => {
     const getXpWeeklyLeaderboardMock = vi.spyOn(WeeklyXpLeaderboard, "get");
+    const getResultMock = vi.fn();
+    const getFriendsUidsMock = vi.spyOn(ConnectionsDal, "getFriendsUids");
 
     beforeEach(async () => {
-      getXpWeeklyLeaderboardMock.mockClear();
+      [getXpWeeklyLeaderboardMock, getResultMock, getFriendsUidsMock].forEach(
+        (it) => it.mockClear()
+      );
       vi.useFakeTimers();
       vi.setSystemTime(1722606812000);
       await weeklyLeaderboardEnabled(true);
 
       getXpWeeklyLeaderboardMock.mockReturnValue({
-        getResults: () => Promise.resolve([]),
-        getCount: () => Promise.resolve(0),
+        getResults: getResultMock,
       } as any);
+
+      getResultMock.mockResolvedValue(null);
     });
 
     afterEach(() => {
@@ -1004,16 +1084,7 @@ describe("Loaderboard Controller", () => {
         },
       ];
 
-      const getResultMock = vi.fn();
-      getResultMock.mockResolvedValue(resultData);
-
-      const getCountMock = vi.fn();
-      getCountMock.mockResolvedValue(2);
-
-      getXpWeeklyLeaderboardMock.mockReturnValue({
-        getResults: getResultMock,
-        getCount: getCountMock,
-      } as any);
+      getResultMock.mockResolvedValue({ count: 2, entries: resultData });
 
       //WHEN
       const { body } = await mockApp
@@ -1033,7 +1104,13 @@ describe("Loaderboard Controller", () => {
 
       expect(getXpWeeklyLeaderboardMock).toHaveBeenCalledWith(lbConf, -1);
 
-      expect(getResultMock).toHaveBeenCalledWith(0, 50, lbConf, false);
+      expect(getResultMock).toHaveBeenCalledWith(
+        0,
+        50,
+        lbConf,
+        false,
+        undefined
+      );
     });
 
     it("should get for last week", async () => {
@@ -1070,17 +1147,6 @@ describe("Loaderboard Controller", () => {
       const page = 2;
       const pageSize = 25;
 
-      const getResultMock = vi.fn();
-      getResultMock.mockResolvedValue([]);
-
-      const getCountMock = vi.fn();
-      getCountMock.mockResolvedValue(0);
-
-      getXpWeeklyLeaderboardMock.mockReturnValue({
-        getResults: getResultMock,
-        getCount: getCountMock,
-      } as any);
-
       //WHEN
       const { body } = await mockApp
         .get("/leaderboards/xp/weekly")
@@ -1102,7 +1168,49 @@ describe("Loaderboard Controller", () => {
 
       expect(getXpWeeklyLeaderboardMock).toHaveBeenCalledWith(lbConf, -1);
 
-      expect(getResultMock).toHaveBeenCalledWith(page, pageSize, lbConf, false);
+      expect(getResultMock).toHaveBeenCalledWith(
+        page,
+        pageSize,
+        lbConf,
+        false,
+        undefined
+      );
+    });
+
+    it("should get for friends", async () => {
+      //GIVEN
+      const lbConf = (await configuration).leaderboards.weeklyXp;
+      await enableConnectionsFeature(true);
+      const page = 2;
+      const pageSize = 25;
+      const friends = [
+        new ObjectId().toHexString(),
+        new ObjectId().toHexString(),
+      ];
+      getFriendsUidsMock.mockResolvedValue(friends);
+
+      //WHEN
+      await mockApp
+        .get("/leaderboards/xp/weekly")
+        .set("Authorization", `Bearer ${uid}`)
+        .query({
+          page,
+          pageSize,
+          friendsOnly: true,
+        })
+        .expect(200);
+
+      //THEN
+
+      expect(getXpWeeklyLeaderboardMock).toHaveBeenCalledWith(lbConf, -1);
+
+      expect(getResultMock).toHaveBeenCalledWith(
+        page,
+        pageSize,
+        lbConf,
+        false,
+        friends
+      );
     });
 
     it("fails if daily leaderboards are disabled", async () => {
@@ -1128,6 +1236,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: ['"weeksBefore" Invalid literal value, expected 1'],
       });
     });
+
     it("fails for unknown query", async () => {
       const { body } = await mockApp
         .get("/leaderboards/xp/weekly")
@@ -1141,6 +1250,7 @@ describe("Loaderboard Controller", () => {
         validationErrors: ["Unrecognized key(s) in object: 'extra'"],
       });
     });
+
     it("fails while leaderboard is missing", async () => {
       //GIVEN
       getXpWeeklyLeaderboardMock.mockReturnValue(null);
@@ -1154,12 +1264,21 @@ describe("Loaderboard Controller", () => {
 
   describe("get xp weekly leaderboard rank", () => {
     const getXpWeeklyLeaderboardMock = vi.spyOn(WeeklyXpLeaderboard, "get");
+    const getRankMock = vi.fn();
+    const getFriendsUidsMock = vi.spyOn(ConnectionsDal, "getFriendsUids");
 
     beforeEach(async () => {
-      getXpWeeklyLeaderboardMock.mockClear();
+      [getXpWeeklyLeaderboardMock, getRankMock, getFriendsUidsMock].forEach(
+        (it) => it.mockClear()
+      );
+
       await weeklyLeaderboardEnabled(true);
       vi.useFakeTimers();
       vi.setSystemTime(1722606812000);
+
+      getXpWeeklyLeaderboardMock.mockReturnValue({
+        getRank: getRankMock,
+      } as any);
     });
 
     it("fails withouth authentication", async () => {
@@ -1180,11 +1299,8 @@ describe("Loaderboard Controller", () => {
         discordAvatar: "discordAvatar",
         lastActivityTimestamp: 1000,
       };
-      const getRankMock = vi.fn();
+
       getRankMock.mockResolvedValue(resultData);
-      getXpWeeklyLeaderboardMock.mockReturnValue({
-        getRank: getRankMock,
-      } as any);
 
       //WHEN
       const { body } = await mockApp
@@ -1200,28 +1316,13 @@ describe("Loaderboard Controller", () => {
 
       expect(getXpWeeklyLeaderboardMock).toHaveBeenCalledWith(lbConf, -1);
 
-      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf);
+      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf, undefined);
     });
 
     it("should get for last week", async () => {
       //GIVEN
       const lbConf = (await configuration).leaderboards.weeklyXp;
-
-      const resultData: XpLeaderboardEntry = {
-        totalXp: 100,
-        rank: 1,
-        timeTypedSeconds: 100,
-        uid: "user1",
-        name: "user1",
-        discordId: "discordId",
-        discordAvatar: "discordAvatar",
-        lastActivityTimestamp: 1000,
-      };
-      const getRankMock = vi.fn();
-      getRankMock.mockResolvedValue(resultData);
-      getXpWeeklyLeaderboardMock.mockReturnValue({
-        getRank: getRankMock,
-      } as any);
+      getRankMock.mockResolvedValue({});
 
       //WHEN
       const { body } = await mockApp
@@ -1233,7 +1334,7 @@ describe("Loaderboard Controller", () => {
       //THEN
       expect(body).toEqual({
         message: "Weekly xp leaderboard rank retrieved",
-        data: resultData,
+        data: {},
       });
 
       expect(getXpWeeklyLeaderboardMock).toHaveBeenCalledWith(
@@ -1241,8 +1342,35 @@ describe("Loaderboard Controller", () => {
         1721606400000
       );
 
-      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf);
+      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf, undefined);
+    });
+
+    it("should get for friendsOnly", async () => {
+      //GIVEN
+      const lbConf = (await configuration).leaderboards.weeklyXp;
+      await enableConnectionsFeature(true);
+      getRankMock.mockResolvedValue({});
+      const friends = ["friendOne", "friendTwo"];
+      getFriendsUidsMock.mockResolvedValue(friends);
+
+      //WHEN
+      const { body } = await mockApp
+        .get("/leaderboards/xp/weekly/rank")
+        .query({ friendsOnly: true })
+        .set("Authorization", `Bearer ${uid}`)
+        .expect(200);
+
+      //THEN
+      expect(body).toEqual({
+        message: "Weekly xp leaderboard rank retrieved",
+        data: {},
+      });
+
+      expect(getXpWeeklyLeaderboardMock).toHaveBeenCalledWith(lbConf, -1);
+
+      expect(getRankMock).toHaveBeenCalledWith(uid, lbConf, friends);
     });
+
     it("fails if daily leaderboards are disabled", async () => {
       await weeklyLeaderboardEnabled(false);
 
diff --git a/backend/__tests__/services/weeky-xp-leaderboard.spec.ts b/backend/__tests__/services/weeky-xp-leaderboard.spec.ts
deleted file mode 100644
index 5fc554bcecd9..000000000000
--- a/backend/__tests__/services/weeky-xp-leaderboard.spec.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { describe, it, expect } from "vitest";
-import * as WeeklyXpLeaderboard from "../../src/services/weekly-xp-leaderboard";
-
-const weeklyXpLeaderboardConfig = {
-  enabled: true,
-  expirationTimeInDays: 15,
-  xpRewardBrackets: [],
-};
-
-describe("Weekly Xp Leaderboard", () => {
-  it("should properly consider config", () => {
-    const weeklyXpLeaderboard = WeeklyXpLeaderboard.get(
-      weeklyXpLeaderboardConfig
-    );
-    expect(weeklyXpLeaderboard).toBeInstanceOf(
-      WeeklyXpLeaderboard.WeeklyXpLeaderboard
-    );
-
-    weeklyXpLeaderboardConfig.enabled = false;
-
-    const weeklyXpLeaderboardNull = WeeklyXpLeaderboard.get(
-      weeklyXpLeaderboardConfig
-    );
-    expect(weeklyXpLeaderboardNull).toBeNull();
-  });
-
-  // TODO: Setup Redis mock and test the rest of this
-});
diff --git a/backend/package.json b/backend/package.json
index 6bd26e3c7b9c..30e90af5e4bd 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -84,7 +84,7 @@
     "@types/swagger-stats": "0.95.11",
     "@types/ua-parser-js": "0.7.36",
     "@types/uuid": "10.0.0",
-    "@vitest/coverage-v8": "4.0.4",
+    "@vitest/coverage-v8": "4.0.8",
     "concurrently": "8.2.2",
     "eslint": "8.57.1",
     "eslint-watch": "8.0.0",
@@ -95,6 +95,6 @@
     "testcontainers": "11.4.0",
     "tsx": "4.16.2",
     "typescript": "5.5.4",
-    "vitest": "4.0.4"
+    "vitest": "4.0.8"
   }
 }
diff --git a/backend/redis-scripts/get-rank.lua b/backend/redis-scripts/get-rank.lua
new file mode 100644
index 000000000000..fe15f6694879
--- /dev/null
+++ b/backend/redis-scripts/get-rank.lua
@@ -0,0 +1,51 @@
+-- Helper to split CSV string into a list
+local function split_csv(csv)
+    local result = {}
+    for user_id in string.gmatch(csv, '([^,]+)') do
+        table.insert(result, user_id)
+    end
+    return result
+end
+
+local redis_call = redis.call
+local leaderboard_scores_key, leaderboard_results_key = KEYS[1], KEYS[2]
+
+local user_id = ARGV[1]
+local include_scores = ARGV[2]
+local user_ids_csv = ARGV[3]
+
+local rank = nil
+local friendsRank = nil
+local result = {}   
+local score = ''
+
+
+-- filtered leaderboard
+if user_ids_csv ~= "" then
+
+    local filtered_user_ids = split_csv(user_ids_csv)
+    local scored_users = {}
+    for _, user_id in ipairs(filtered_user_ids) do
+        local score = redis_call('ZSCORE', leaderboard_scores_key, user_id)
+        if score then
+            local number_score = tonumber(score)            
+            table.insert(scored_users, {user_id = user_id, score = number_score})
+        end
+    end
+    table.sort(scored_users, function(a, b) return a.score > b.score end)   
+
+    for i = 1, #scored_users do
+        if scored_users[i].user_id == user_id then
+            friendsRank = i - 1
+        end
+    end
+
+end
+
+rank = redis_call('ZREVRANK', leaderboard_scores_key, user_id)
+if (include_scores == "true") then
+    score = redis_call('ZSCORE', leaderboard_scores_key, user_id)
+end
+result = redis_call('HGET', leaderboard_results_key, user_id)
+
+return {rank, score, result, friendsRank}
\ No newline at end of file
diff --git a/backend/redis-scripts/get-results.lua b/backend/redis-scripts/get-results.lua
index 3897517c3002..14cded2309b5 100644
--- a/backend/redis-scripts/get-results.lua
+++ b/backend/redis-scripts/get-results.lua
@@ -1,24 +1,84 @@
+-- Helper to split CSV string into a list
+local function split_csv(csv)
+    local result = {}
+    for user_id in string.gmatch(csv, '([^,]+)') do
+        table.insert(result, user_id)
+    end
+    return result
+end
+
 local redis_call = redis.call
 local leaderboard_scores_key, leaderboard_results_key = KEYS[1], KEYS[2]
 
 local min_rank = tonumber(ARGV[1])
 local max_rank = tonumber(ARGV[2])
 local include_scores = ARGV[3]
+local user_ids_csv = ARGV[4]
 
 local results = {}
 local scores = {}
-local scores_in_range = redis_call('ZRANGE', leaderboard_scores_key, min_rank, max_rank, 'REV')
+local ranks = {}
+local count = nil
+local min_score = {user_id = nil, score = nil}
+
 
-for _, user_id in ipairs(scores_in_range) do
-    local result_data = redis_call('HGET', leaderboard_results_key, user_id)
+-- filtered leaderboard
+if user_ids_csv ~= "" then  
 
-    if (include_scores == "true") then
-        scores[#scores + 1] = redis_call('ZSCORE', leaderboard_scores_key, user_id)
+    local filtered_user_ids = split_csv(user_ids_csv)
+    local scored_users = {}
+    for _, user_id in ipairs(filtered_user_ids) do
+        local score = redis_call('ZSCORE', leaderboard_scores_key, user_id)
+        if score then
+            local number_score = tonumber(score)            
+            table.insert(scored_users, {user_id = user_id, score = number_score})
+        end
     end
+    table.sort(scored_users, function(a, b) return a.score > b.score end)
+
+
+    if #scored_users > 0 then
+        min_score = {scored_users[#scored_users].user_id, scored_users[#scored_users].score}
+    end
+    count = #scored_users
+
+    for i = min_rank + 1, math.min(max_rank + 1, #scored_users) do
+        local entry = scored_users[i]
+        local user_id = entry.user_id
+        local score = tostring(entry.score)
+
+        local result_data = redis_call('HGET', leaderboard_results_key, user_id)
+
+        if result_data ~= nil then
+            results[#results + 1] = result_data
+
+            local global_rank = redis_call('ZREVRANK', leaderboard_scores_key, user_id)
+            ranks[#ranks + 1] = global_rank or -1  -- -1 if not found
+        end
+
+        if include_scores == "true" then
+            scores[#scores + 1] = score
+        end
+   
+    end 
+
+else
+-- global leaderboard
+    local scores_in_range = redis_call('ZRANGE', leaderboard_scores_key, min_rank, max_rank, 'REV')
+    min_score = redis_call('ZRANGE', leaderboard_scores_key, 0, 0, 'WITHSCORES')
+    count = redis_call('ZCARD', leaderboard_scores_key)
+
+    for _, user_id in ipairs(scores_in_range) do
+        local result_data = redis_call('HGET', leaderboard_results_key, user_id)
+
+        if (include_scores == "true") then
+            scores[#scores + 1] = redis_call('ZSCORE', leaderboard_scores_key, user_id)
+        end
 
-    if (result_data ~= nil) then
-        results[#results + 1] = result_data
+        if (result_data ~= nil) then
+            results[#results + 1] = result_data
+        end
     end
 end
 
-return {results, scores}
\ No newline at end of file
+return {results, scores, count, min_score, ranks}
\ No newline at end of file
diff --git a/backend/src/api/controllers/leaderboard.ts b/backend/src/api/controllers/leaderboard.ts
index 201da3def097..ae7c47a74d16 100644
--- a/backend/src/api/controllers/leaderboard.ts
+++ b/backend/src/api/controllers/leaderboard.ts
@@ -137,7 +137,15 @@ function getDailyLeaderboardWithError(
 export async function getDailyLeaderboard(
   req: MonkeyRequest<GetDailyLeaderboardQuery>
 ): Promise<GetDailyLeaderboardResponse> {
-  const { page, pageSize } = req.query;
+  const { page, pageSize, friendsOnly } = req.query;
+  const { uid } = req.ctx.decodedToken;
+  const connectionsConfig = req.ctx.configuration.connections;
+
+  const friendUids = await getFriendsUids(
+    uid,
+    friendsOnly === true,
+    connectionsConfig
+  );
 
   const dailyLeaderboard = getDailyLeaderboardWithError(
     req.query,
@@ -148,19 +156,14 @@ export async function getDailyLeaderboard(
     page,
     pageSize,
     req.ctx.configuration.dailyLeaderboards,
-    req.ctx.configuration.users.premium.enabled
-  );
-
-  const minWpm = await dailyLeaderboard.getMinWpm(
-    req.ctx.configuration.dailyLeaderboards
+    req.ctx.configuration.users.premium.enabled,
+    friendUids
   );
 
-  const count = await dailyLeaderboard.getCount();
-
   return new MonkeyResponse("Daily leaderboard retrieved", {
-    entries: results,
-    minWpm,
-    count,
+    entries: results?.entries ?? [],
+    count: results?.count ?? 0,
+    minWpm: results?.minWpm ?? 0,
     pageSize,
   });
 }
@@ -168,7 +171,15 @@ export async function getDailyLeaderboard(
 export async function getDailyLeaderboardRank(
   req: MonkeyRequest<GetDailyLeaderboardRankQuery>
 ): Promise<GetLeaderboardDailyRankResponse> {
+  const { friendsOnly } = req.query;
   const { uid } = req.ctx.decodedToken;
+  const connectionsConfig = req.ctx.configuration.connections;
+
+  const friendUids = await getFriendsUids(
+    uid,
+    friendsOnly === true,
+    connectionsConfig
+  );
 
   const dailyLeaderboard = getDailyLeaderboardWithError(
     req.query,
@@ -177,7 +188,8 @@ export async function getDailyLeaderboardRank(
 
   const rank = await dailyLeaderboard.getRank(
     uid,
-    req.ctx.configuration.dailyLeaderboards
+    req.ctx.configuration.dailyLeaderboards,
+    friendUids
   );
 
   return new MonkeyResponse("Daily leaderboard rank retrieved", rank);
@@ -200,10 +212,19 @@ function getWeeklyXpLeaderboardWithError(
   return weeklyXpLeaderboard;
 }
 
-export async function getWeeklyXpLeaderboardResults(
+export async function getWeeklyXpLeaderboard(
   req: MonkeyRequest<GetWeeklyXpLeaderboardQuery>
 ): Promise<GetWeeklyXpLeaderboardResponse> {
-  const { page, pageSize, weeksBefore } = req.query;
+  const { page, pageSize, weeksBefore, friendsOnly } = req.query;
+
+  const { uid } = req.ctx.decodedToken;
+  const connectionsConfig = req.ctx.configuration.connections;
+
+  const friendUids = await getFriendsUids(
+    uid,
+    friendsOnly === true,
+    connectionsConfig
+  );
 
   const weeklyXpLeaderboard = getWeeklyXpLeaderboardWithError(
     req.ctx.configuration.leaderboards.weeklyXp,
@@ -213,14 +234,13 @@ export async function getWeeklyXpLeaderboardResults(
     page,
     pageSize,
     req.ctx.configuration.leaderboards.weeklyXp,
-    req.ctx.configuration.users.premium.enabled
+    req.ctx.configuration.users.premium.enabled,
+    friendUids
   );
 
-  const count = await weeklyXpLeaderboard.getCount();
-
   return new MonkeyResponse("Weekly xp leaderboard retrieved", {
-    entries: results,
-    count,
+    entries: results?.entries ?? [],
+    count: results?.count ?? 0,
     pageSize,
   });
 }
@@ -228,7 +248,15 @@ export async function getWeeklyXpLeaderboardResults(
 export async function getWeeklyXpLeaderboardRank(
   req: MonkeyRequest<GetWeeklyXpLeaderboardRankQuery>
 ): Promise<GetWeeklyXpLeaderboardRankResponse> {
+  const { friendsOnly } = req.query;
   const { uid } = req.ctx.decodedToken;
+  const connectionsConfig = req.ctx.configuration.connections;
+
+  const friendUids = await getFriendsUids(
+    uid,
+    friendsOnly === true,
+    connectionsConfig
+  );
 
   const weeklyXpLeaderboard = getWeeklyXpLeaderboardWithError(
     req.ctx.configuration.leaderboards.weeklyXp,
@@ -236,7 +264,8 @@ export async function getWeeklyXpLeaderboardRank(
   );
   const rankEntry = await weeklyXpLeaderboard.getRank(
     uid,
-    req.ctx.configuration.leaderboards.weeklyXp
+    req.ctx.configuration.leaderboards.weeklyXp,
+    friendUids
   );
 
   return new MonkeyResponse("Weekly xp leaderboard rank retrieved", rankEntry);
diff --git a/backend/src/api/routes/leaderboards.ts b/backend/src/api/routes/leaderboards.ts
index 1533fd562d67..a9da7a143df4 100644
--- a/backend/src/api/routes/leaderboards.ts
+++ b/backend/src/api/routes/leaderboards.ts
@@ -23,7 +23,7 @@ export default s.router(leaderboardsContract, {
   },
   getWeeklyXp: {
     handler: async (r) =>
-      callController(LeaderboardController.getWeeklyXpLeaderboardResults)(r),
+      callController(LeaderboardController.getWeeklyXpLeaderboard)(r),
   },
   getWeeklyXpRank: {
     handler: async (r) =>
diff --git a/backend/src/init/redis.ts b/backend/src/init/redis.ts
index 8b816d3aa904..dc09f29aec93 100644
--- a/backend/src/init/redis.ts
+++ b/backend/src/init/redis.ts
@@ -33,8 +33,19 @@ export type RedisConnectionWithCustomMethods = Redis & {
     resultsKey: string,
     minRank: number,
     maxRank: number,
-    withScores: string
-  ) => Promise<[string[], string[]]>;
+    withScores: string,
+    userIds: string
+  ) => Promise<
+    [string[], string[], string, [string, string | number], string[]]
+  >; //entries, scores(optional), count, min_score(optiona)[uid, score], ranks(optional)
+  getRank: (
+    keyCount: number,
+    scoresKey: string,
+    resultsKey: string,
+    uid: string,
+    withScores: string,
+    userIds: string
+  ) => Promise<[number, string, string, number]>; //rank, score(optional), entry json, friendsRank(optional)
   purgeResults: (
     keyCount: number,
     uid: string,
diff --git a/backend/src/services/weekly-xp-leaderboard.ts b/backend/src/services/weekly-xp-leaderboard.ts
index 3d2bcfaba517..f93dd568a871 100644
--- a/backend/src/services/weekly-xp-leaderboard.ts
+++ b/backend/src/services/weekly-xp-leaderboard.ts
@@ -11,7 +11,6 @@ import { getCurrentWeekTimestamp } from "@monkeytype/util/date-and-time";
 import MonkeyError from "../utils/error";
 import { omit } from "lodash";
 import { parseWithSchema as parseJsonWithSchema } from "@monkeytype/util/json";
-import { tryCatchSync } from "@monkeytype/util/trycatch";
 
 export type AddResultOpts = {
   entry: RedisXpLeaderboardEntry;
@@ -121,31 +120,41 @@ export class WeeklyXpLeaderboard {
     page: number,
     pageSize: number,
     weeklyXpLeaderboardConfig: Configuration["leaderboards"]["weeklyXp"],
-    premiumFeaturesEnabled: boolean
-  ): Promise<XpLeaderboardEntry[]> {
+    premiumFeaturesEnabled: boolean,
+    userIds?: string[]
+  ): Promise<{
+    entries: XpLeaderboardEntry[];
+    count: number;
+  } | null> {
     const connection = RedisClient.getConnection();
     if (!connection || !weeklyXpLeaderboardConfig.enabled) {
-      return [];
+      return null;
     }
 
     if (page < 0 || pageSize < 0) {
       throw new MonkeyError(500, "Invalid page or pageSize");
     }
 
+    if (userIds?.length === 0) {
+      return { entries: [], count: 0 };
+    }
+
+    const isFriends = userIds !== undefined;
     const minRank = page * pageSize;
     const maxRank = minRank + pageSize - 1;
 
     const { weeklyXpLeaderboardScoresKey, weeklyXpLeaderboardResultsKey } =
       this.getThisWeeksXpLeaderboardKeys();
 
-    const [results, scores] = (await connection.getResults(
+    const [results, scores, count, _, ranks] = await connection.getResults(
       2,
       weeklyXpLeaderboardScoresKey,
       weeklyXpLeaderboardResultsKey,
       minRank,
       maxRank,
-      "true"
-    )) as string[][];
+      "true",
+      userIds?.join(",") ?? ""
+    );
 
     if (results === undefined) {
       throw new Error(
@@ -159,7 +168,7 @@ export class WeeklyXpLeaderboard {
       );
     }
 
-    const resultsWithRanks: XpLeaderboardEntry[] = results.map(
+    let resultsWithRanks: XpLeaderboardEntry[] = results.map(
       (resultJSON: string, index: number) => {
         try {
           const parsed = parseJsonWithSchema(
@@ -176,7 +185,10 @@ export class WeeklyXpLeaderboard {
 
           return {
             ...parsed,
-            rank: minRank + index + 1,
+            rank: isFriends
+              ? new Number(ranks[index]).valueOf() + 1
+              : minRank + index + 1,
+            friendsRank: isFriends ? minRank + index + 1 : undefined,
             totalXp: parseInt(scoreValue, 10),
           };
         } catch (error) {
@@ -190,70 +202,55 @@ export class WeeklyXpLeaderboard {
     );
 
     if (!premiumFeaturesEnabled) {
-      return resultsWithRanks.map((it) => omit(it, "isPremium"));
+      resultsWithRanks = resultsWithRanks.map((it) => omit(it, "isPremium"));
     }
 
-    return resultsWithRanks;
+    return { entries: resultsWithRanks, count: parseInt(count) };
   }
 
   public async getRank(
     uid: string,
-    weeklyXpLeaderboardConfig: Configuration["leaderboards"]["weeklyXp"]
+    weeklyXpLeaderboardConfig: Configuration["leaderboards"]["weeklyXp"],
+    userIds?: string[]
   ): Promise<XpLeaderboardEntry | null> {
     const connection = RedisClient.getConnection();
     if (!connection || !weeklyXpLeaderboardConfig.enabled) {
       throw new Error("Redis connection is unavailable");
     }
+    if (userIds?.length === 0) {
+      return null;
+    }
 
     const { weeklyXpLeaderboardScoresKey, weeklyXpLeaderboardResultsKey } =
       this.getThisWeeksXpLeaderboardKeys();
 
-    const [[, rank], [, totalXp], [, _count], [, result]] = (await connection
-      .multi()
-      .zrevrank(weeklyXpLeaderboardScoresKey, uid)
-      .zscore(weeklyXpLeaderboardScoresKey, uid)
-      .zcard(weeklyXpLeaderboardScoresKey)
-      .hget(weeklyXpLeaderboardResultsKey, uid)
-      .exec()) as [
-      [null, number | null],
-      [null, string | null],
-      [null, number | null],
-      [null, string | null]
-    ];
+    const [rank, score, result, friendsRank] = await connection.getRank(
+      2,
+      weeklyXpLeaderboardScoresKey,
+      weeklyXpLeaderboardResultsKey,
+      uid,
+      "true",
+      userIds?.join(",") ?? ""
+    );
 
     if (rank === null || result === null) {
       return null;
     }
 
-    const { data: parsed, error } = tryCatchSync(() =>
-      parseJsonWithSchema(result, RedisXpLeaderboardEntrySchema)
-    );
-
-    if (error) {
+    try {
+      return {
+        ...parseJsonWithSchema(result ?? "null", RedisXpLeaderboardEntrySchema),
+        rank: rank + 1,
+        friendsRank: friendsRank !== undefined ? friendsRank + 1 : undefined,
+        totalXp: parseInt(score, 10),
+      };
+    } catch (error) {
       throw new Error(
         `Failed to parse leaderboard entry: ${
           error instanceof Error ? error.message : String(error)
         }`
       );
     }
-
-    return {
-      ...parsed,
-      rank: rank + 1,
-      totalXp: parseInt(totalXp as string, 10),
-    };
-  }
-
-  public async getCount(): Promise<number> {
-    const connection = RedisClient.getConnection();
-    if (!connection) {
-      throw new Error("Redis connection is unavailable");
-    }
-
-    const { weeklyXpLeaderboardScoresKey } =
-      this.getThisWeeksXpLeaderboardKeys();
-
-    return connection.zcard(weeklyXpLeaderboardScoresKey);
   }
 }
 
diff --git a/backend/src/utils/daily-leaderboards.ts b/backend/src/utils/daily-leaderboards.ts
index c0b5aa57ef2e..9b3289a6c754 100644
--- a/backend/src/utils/daily-leaderboards.ts
+++ b/backend/src/utils/daily-leaderboards.ts
@@ -112,31 +112,48 @@ export class DailyLeaderboard {
     page: number,
     pageSize: number,
     dailyLeaderboardsConfig: Configuration["dailyLeaderboards"],
-    premiumFeaturesEnabled: boolean
-  ): Promise<LeaderboardEntry[]> {
+    premiumFeaturesEnabled: boolean,
+    userIds?: string[]
+  ): Promise<{
+    entries: LeaderboardEntry[];
+    count: number;
+    minWpm: number;
+  } | null> {
     const connection = RedisClient.getConnection();
     if (!connection || !dailyLeaderboardsConfig.enabled) {
-      return [];
+      return null;
     }
 
     if (page < 0 || pageSize < 0) {
       throw new MonkeyError(500, "Invalid page or pageSize");
     }
 
+    if (userIds?.length === 0) {
+      return { entries: [], count: 0, minWpm: 0 };
+    }
+
+    const isFriends = userIds !== undefined;
     const minRank = page * pageSize;
     const maxRank = minRank + pageSize - 1;
 
     const { leaderboardScoresKey, leaderboardResultsKey } =
       this.getTodaysLeaderboardKeys();
 
-    const [results, _] = await connection.getResults(
-      2,
-      leaderboardScoresKey,
-      leaderboardResultsKey,
-      minRank,
-      maxRank,
-      "false"
-    );
+    const [results, _, count, [_uid, minScore], ranks] =
+      await connection.getResults(
+        2,
+        leaderboardScoresKey,
+        leaderboardResultsKey,
+        minRank,
+        maxRank,
+        "false",
+        userIds?.join(",") ?? ""
+      );
+
+    const minWpm =
+      minScore !== undefined
+        ? parseInt(minScore.toString().slice(1, 6)) / 100
+        : 0;
 
     if (results === undefined) {
       throw new Error(
@@ -144,7 +161,7 @@ export class DailyLeaderboard {
       );
     }
 
-    const resultsWithRanks: LeaderboardEntry[] = results.map(
+    let resultsWithRanks: LeaderboardEntry[] = results.map(
       (resultJSON, index) => {
         try {
           const parsed = parseJsonWithSchema(
@@ -154,7 +171,10 @@ export class DailyLeaderboard {
 
           return {
             ...parsed,
-            rank: minRank + index + 1,
+            rank: isFriends
+              ? new Number(ranks[index]).valueOf() + 1
+              : minRank + index + 1,
+            friendsRank: isFriends ? minRank + index + 1 : undefined,
           };
         } catch (error) {
           throw new Error(
@@ -167,61 +187,38 @@ export class DailyLeaderboard {
     );
 
     if (!premiumFeaturesEnabled) {
-      return resultsWithRanks.map((it) => omit(it, "isPremium"));
+      resultsWithRanks = resultsWithRanks.map((it) => omit(it, "isPremium"));
     }
 
-    return resultsWithRanks;
-  }
-
-  public async getMinWpm(
-    dailyLeaderboardsConfig: Configuration["dailyLeaderboards"]
-  ): Promise<number> {
-    const connection = RedisClient.getConnection();
-    if (!connection || !dailyLeaderboardsConfig.enabled) {
-      return 0;
-    }
-
-    const { leaderboardScoresKey } = this.getTodaysLeaderboardKeys();
-
-    const [_uid, minScore] = (await connection.zrange(
-      leaderboardScoresKey,
-      0,
-      0,
-      "WITHSCORES"
-    )) as [string, string];
-
-    const minWpm =
-      minScore !== undefined ? parseInt(minScore?.slice(1, 6)) / 100 : 0;
-
-    return minWpm;
+    return { entries: resultsWithRanks, count: parseInt(count), minWpm };
   }
 
   public async getRank(
     uid: string,
-    dailyLeaderboardsConfig: Configuration["dailyLeaderboards"]
+    dailyLeaderboardsConfig: Configuration["dailyLeaderboards"],
+    userIds?: string[]
   ): Promise<LeaderboardEntry | null> {
     const connection = RedisClient.getConnection();
     if (!connection || !dailyLeaderboardsConfig.enabled) {
       throw new Error("Redis connection is unavailable");
     }
+    if (userIds?.length === 0) {
+      return null;
+    }
 
     const { leaderboardScoresKey, leaderboardResultsKey } =
       this.getTodaysLeaderboardKeys();
 
-    const redisExecResult = (await connection
-      .multi()
-      .zrevrank(leaderboardScoresKey, uid)
-      .zcard(leaderboardScoresKey)
-      .hget(leaderboardResultsKey, uid)
-      .exec()) as [
-      [null, number | null],
-      [null, number | null],
-      [null, string | null]
-    ];
-
-    const [[, rank], [, _count], [, result]] = redisExecResult;
+    const [rank, _score, result, friendsRank] = await connection.getRank(
+      2,
+      leaderboardScoresKey,
+      leaderboardResultsKey,
+      uid,
+      "false",
+      userIds?.join(",") ?? ""
+    );
 
-    if (rank === null) {
+    if (rank === null || rank === undefined) {
       return null;
     }
 
@@ -232,6 +229,7 @@ export class DailyLeaderboard {
           RedisDailyLeaderboardEntrySchema
         ),
         rank: rank + 1,
+        friendsRank: friendsRank !== undefined ? friendsRank + 1 : undefined,
       };
     } catch (error) {
       throw new Error(
@@ -241,17 +239,6 @@ export class DailyLeaderboard {
       );
     }
   }
-
-  public async getCount(): Promise<number> {
-    const connection = RedisClient.getConnection();
-    if (!connection) {
-      throw new Error("Redis connection is unavailable");
-    }
-
-    const { leaderboardScoresKey } = this.getTodaysLeaderboardKeys();
-
-    return connection.zcard(leaderboardScoresKey);
-  }
 }
 
 export async function purgeUserFromDailyLeaderboards(
diff --git a/backend/src/workers/later-worker.ts b/backend/src/workers/later-worker.ts
index 2ca2ea8f31dc..57c8e34f4447 100644
--- a/backend/src/workers/later-worker.ts
+++ b/backend/src/workers/later-worker.ts
@@ -45,7 +45,7 @@ async function handleDailyLeaderboardResults(
     false
   );
 
-  if (results.length === 0) {
+  if (results === null || results.entries.length === 0) {
     return;
   }
 
@@ -55,7 +55,7 @@ async function handleDailyLeaderboardResults(
       mail: MonkeyMail[];
     }[] = [];
 
-    results.forEach((entry) => {
+    results.entries.forEach((entry) => {
       const rank = entry.rank ?? maxResults;
       const wpm = Math.round(entry.wpm);
 
@@ -96,7 +96,7 @@ async function handleDailyLeaderboardResults(
     await addToInboxBulk(mailEntries, inboxConfig);
   }
 
-  const topResults = results.slice(
+  const topResults = results.entries.slice(
     0,
     dailyLeaderboardsConfig.topResultsToAnnounce
   );
@@ -136,7 +136,7 @@ async function handleWeeklyXpLeaderboardResults(
     false
   );
 
-  if (allResults.length === 0) {
+  if (allResults === null || allResults.entries.length === 0) {
     return;
   }
 
@@ -145,7 +145,7 @@ async function handleWeeklyXpLeaderboardResults(
     mail: MonkeyMail[];
   }[] = [];
 
-  allResults.forEach((entry) => {
+  allResults?.entries.forEach((entry) => {
     const { uid, name, rank = maxRankToGet, totalXp, timeTypedSeconds } = entry;
 
     const xp = Math.round(totalXp);
diff --git a/backend/vitest.config.ts b/backend/vitest.config.ts
index 8b3d7bcdca31..ed73f2e84b0b 100644
--- a/backend/vitest.config.ts
+++ b/backend/vitest.config.ts
@@ -38,11 +38,7 @@ export const projects: UserWorkspaceConfig[] = [
         groupOrder: 2,
       },
       pool: "threads",
-      poolOptions: {
-        threads: {
-          singleThread: true,
-        },
-      },
+      maxWorkers: 1,
     },
   },
 ];
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index a65217e23879..968f9be8431e 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -27,7 +27,8 @@ Below is a set of general guidelines for different types of changes.
 
 ### Pull Request Naming Guidelines
 
-We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for our pull request titles (and commit messages on the master branch). Please follow the guidelines below when naming pull requests.
+We use [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) for our pull request titles (and commit messages on the master branch) and also include the author name at the end inside parenthesis.  Please follow the guidelines below when naming pull requests.
+
 
 For types, we use the following:
 
@@ -44,6 +45,12 @@ For types, we use the following:
 - `revert`: Reverts a previous commit
 - `chore`: Other changes that don't apply to any of the above
 
+#### Examples
+
+- `feat: add new feature (@github_username)`
+- `impr(quotes): add english quotes (@username)`
+- `fix(leaderboard): show user rank correctly (@user1, @user2, @user3)`
+
 ### Theme Guidelines
 
 <!-- TODO: add screenshots to provide examples for dos and don'ts -->
diff --git a/frontend/package.json b/frontend/package.json
index 9461dadb6888..332b82401604 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -55,7 +55,7 @@
     "@types/object-hash": "3.0.6",
     "@types/subset-font": "1.4.3",
     "@types/throttle-debounce": "5.0.2",
-    "@vitest/coverage-v8": "4.0.4",
+    "@vitest/coverage-v8": "4.0.8",
     "autoprefixer": "10.4.20",
     "concurrently": "8.2.2",
     "dotenv": "16.4.5",
@@ -63,7 +63,7 @@
     "eslint-plugin-compat": "6.0.2",
     "firebase-tools": "13.15.1",
     "fontawesome-subset": "4.4.0",
-    "happy-dom": "20.0.2",
+    "happy-dom": "20.0.10",
     "madge": "8.0.0",
     "magic-string": "0.30.17",
     "normalize.css": "8.0.1",
@@ -82,7 +82,7 @@
     "vite-plugin-inspect": "11.3.3",
     "vite-plugin-minify": "2.1.0",
     "vite-plugin-pwa": "1.1.0",
-    "vitest": "4.0.4"
+    "vitest": "4.0.8"
   },
   "dependencies": {
     "@date-fns/utc": "1.2.0",
diff --git a/frontend/src/html/pages/settings.html b/frontend/src/html/pages/settings.html
index 8b232477b7fe..945469999a86 100644
--- a/frontend/src/html/pages/settings.html
+++ b/frontend/src/html/pages/settings.html
@@ -1469,7 +1469,9 @@
         random themes are not saved to your config. If set to 'favorite' only
         favorite themes will be randomized. If set to 'light' or 'dark', only
         presets with light or dark background colors will be randomized,
-        respectively. If set to 'custom', custom themes will be randomized.
+        respectively. If set to 'auto' dark or light themes are used, depending
+        on your system theme. If set to 'custom', custom themes will be
+        randomized.
       </div>
       <div class="buttons">
         <button data-config-value="off">off</button>
@@ -1477,6 +1479,7 @@
         <button data-config-value="fav">favorite</button>
         <button data-config-value="light">light</button>
         <button data-config-value="dark">dark</button>
+        <button data-config-value="auto">auto</button>
         <button data-config-value="custom">custom</button>
       </div>
     </div>
diff --git a/frontend/src/html/popups.html b/frontend/src/html/popups.html
index 631f5f44194f..2b51f5751973 100644
--- a/frontend/src/html/popups.html
+++ b/frontend/src/html/popups.html
@@ -1276,14 +1276,6 @@
   </div>
 </dialog>
 
-<dialog id="newFilterPresetModal" class="modalWrapper hidden">
-  <form class="modal">
-    <div class="title">New filter preset</div>
-    <input type="text" value="" />
-    <button>add</button>
-  </form>
-</dialog>
-
 <dialog id="editProfileModal" class="modalWrapper hidden">
   <form class="modal">
     <div class="title">Edit Profile</div>
diff --git a/frontend/src/styles/popups.scss b/frontend/src/styles/popups.scss
index 8ae8d6a33e8f..82501c7c2455 100644
--- a/frontend/src/styles/popups.scss
+++ b/frontend/src/styles/popups.scss
@@ -1654,12 +1654,6 @@ body.darkMode {
   }
 }
 
-#newFilterPresetModal {
-  .modal {
-    max-width: 450px;
-  }
-}
-
 #editProfileModal {
   .modal {
     max-width: 600px;
diff --git a/frontend/src/ts/ape/adapters/ts-rest-adapter.ts b/frontend/src/ts/ape/adapters/ts-rest-adapter.ts
index 298b6b3b88bf..35e9e0e4ec60 100644
--- a/frontend/src/ts/ape/adapters/ts-rest-adapter.ts
+++ b/frontend/src/ts/ape/adapters/ts-rest-adapter.ts
@@ -4,7 +4,7 @@ import {
   tsRestFetchApi,
   type ApiFetcherArgs,
 } from "@ts-rest/core";
-import { envConfig } from "../../constants/env-config";
+import { envConfig } from "virtual:env-config";
 import { getIdToken } from "../../firebase";
 import {
   COMPATIBILITY_CHECK,
diff --git a/frontend/src/ts/ape/index.ts b/frontend/src/ts/ape/index.ts
index 52083d0db828..f1778399c3a1 100644
--- a/frontend/src/ts/ape/index.ts
+++ b/frontend/src/ts/ape/index.ts
@@ -1,4 +1,4 @@
-import { envConfig } from "../constants/env-config";
+import { envConfig } from "virtual:env-config";
 import { buildClient } from "./adapters/ts-rest-adapter";
 import { contract } from "@monkeytype/contracts";
 import { devContract } from "@monkeytype/contracts/dev";
diff --git a/frontend/src/ts/constants/env-config.ts b/frontend/src/ts/constants/env-config.ts
deleted file mode 100644
index 9bb809fc8fbb..000000000000
--- a/frontend/src/ts/constants/env-config.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-type Config = {
-  backendUrl: string;
-  isDevelopment: boolean;
-  clientVersion: string;
-  recaptchaSiteKey: string;
-  quickLoginEmail: string | undefined;
-  quickLoginPassword: string | undefined;
-};
-
-//@ts-expect-error these get replaced by vite
-const backendUrl = BACKEND_URL;
-// @ts-expect-error ---
-const isDevelopment = IS_DEVELOPMENT;
-// @ts-expect-error ---
-const clientVersion = CLIENT_VERSION;
-// @ts-expect-error ---
-const recaptchaSiteKey = RECAPTCHA_SITE_KEY;
-// @ts-expect-error ---
-const quickLoginEmail = QUICK_LOGIN_EMAIL;
-// @ts-expect-error ---
-const quickLoginPassword = QUICK_LOGIN_PASSWORD;
-
-export const envConfig: Config = {
-  backendUrl,
-  isDevelopment,
-  clientVersion,
-  recaptchaSiteKey,
-  quickLoginEmail,
-  quickLoginPassword,
-};
diff --git a/frontend/src/ts/constants/languages.ts b/frontend/src/ts/constants/languages.ts
index eda60c374c2f..c4c921fffb12 100644
--- a/frontend/src/ts/constants/languages.ts
+++ b/frontend/src/ts/constants/languages.ts
@@ -134,7 +134,7 @@ export const LanguageGroups: Record<string, Language[]> = {
   dutch: ["dutch", "dutch_1k", "dutch_10k"],
   filipino: ["filipino", "filipino_1k"],
   danish: ["danish", "danish_1k", "danish_10k"],
-  hungarian: ["hungarian", "hungarian_2k"],
+  hungarian: ["hungarian", "hungarian_1k", "hungarian_2k"],
   norwegian_bokmal: [
     "norwegian_bokmal",
     "norwegian_bokmal_1k",
diff --git a/frontend/src/ts/constants/themes.ts b/frontend/src/ts/constants/themes.ts
index 65ff67be00df..dd74af172235 100644
--- a/frontend/src/ts/constants/themes.ts
+++ b/frontend/src/ts/constants/themes.ts
@@ -1114,6 +1114,12 @@ export const themes: Record<ThemeName, Omit<Theme, "name">> = {
     subColor: "#5b578e",
     textColor: "#f4e0c9",
   },
+  pale_nimbus: {
+    bgColor: "#433e4c",
+    mainColor: "#94ffc2",
+    subColor: "#ffaca3",
+    textColor: "#feffdb",
+  },
 };
 
 export const ThemesList: Theme[] = Object.keys(themes)
diff --git a/frontend/src/ts/controllers/captcha-controller.ts b/frontend/src/ts/controllers/captcha-controller.ts
index 3041e12595df..66782db53504 100644
--- a/frontend/src/ts/controllers/captcha-controller.ts
+++ b/frontend/src/ts/controllers/captcha-controller.ts
@@ -1,7 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { envConfig } from "../constants/env-config";
+import { envConfig } from "virtual:env-config";
 const siteKey = envConfig.recaptchaSiteKey;
 
 const captchas: Record<string, number> = {};
diff --git a/frontend/src/ts/controllers/input-controller.ts b/frontend/src/ts/controllers/input-controller.ts
index 7cd5811d15e9..ce69932a6812 100644
--- a/frontend/src/ts/controllers/input-controller.ts
+++ b/frontend/src/ts/controllers/input-controller.ts
@@ -431,18 +431,6 @@ async function handleChar(
     return;
   }
 
-  if (char === "œ" && TestWords.words.getCurrent()[charIndex] !== "œ") {
-    await handleChar("o", charIndex);
-    await handleChar("e", charIndex + 1);
-    return;
-  }
-
-  if (char === "æ" && TestWords.words.getCurrent()[charIndex] !== "æ") {
-    await handleChar("a", charIndex);
-    await handleChar("e", charIndex + 1);
-    return;
-  }
-
   console.debug("Handling char", char, charIndex, realInputValue);
 
   const now = performance.now();
diff --git a/frontend/src/ts/controllers/theme-controller.ts b/frontend/src/ts/controllers/theme-controller.ts
index 16690c41f589..340b18cb6628 100644
--- a/frontend/src/ts/controllers/theme-controller.ts
+++ b/frontend/src/ts/controllers/theme-controller.ts
@@ -11,7 +11,7 @@ import * as Notifications from "../elements/notifications";
 import * as Loader from "../elements/loader";
 import { debounce } from "throttle-debounce";
 import { ThemeName } from "@monkeytype/schemas/configs";
-import { ThemesList } from "../constants/themes";
+import { themes, ThemesList } from "../constants/themes";
 import fileStorage from "../utils/file-storage";
 
 export let randomTheme: ThemeName | string | null = null;
@@ -307,7 +307,7 @@ async function changeThemeList(): Promise<void> {
     themesList = themes
       .filter((t) => isColorDark(t.bgColor))
       .map((t) => t.name);
-  } else if (Config.randomTheme === "on") {
+  } else if (Config.randomTheme === "on" || Config.randomTheme === "auto") {
     themesList = themes.map((t) => {
       return t.name;
     });
@@ -323,14 +323,23 @@ export async function randomizeTheme(): Promise<void> {
     await changeThemeList();
     if (themesList.length === 0) return;
   }
-  randomTheme = themesList[randomThemeIndex] as string;
-  randomThemeIndex++;
 
-  if (randomThemeIndex >= themesList.length) {
-    Arrays.shuffle(themesList);
-    randomThemeIndex = 0;
+  let filter = (_: string): boolean => true;
+  if (Config.randomTheme === "auto") {
+    filter = prefersColorSchemeDark() ? isColorDark : isColorLight;
   }
 
+  let nextTheme = null;
+  do {
+    randomTheme = themesList[randomThemeIndex] as string;
+    nextTheme = themes[themesList[randomThemeIndex] as ThemeName];
+    randomThemeIndex++;
+    if (randomThemeIndex >= themesList.length) {
+      Arrays.shuffle(themesList);
+      randomThemeIndex = 0;
+    }
+  } while (!filter(nextTheme.bgColor));
+
   let colorsOverride: string[] | undefined;
 
   if (Config.randomTheme === "custom") {
@@ -484,7 +493,7 @@ ConfigEvent.subscribe(async (eventKey, eventValue, nosave) => {
     await clearRandom();
     await clearPreview(false);
     if (Config.autoSwitchTheme) {
-      if (window.matchMedia?.("(prefers-color-scheme: dark)").matches) {
+      if (prefersColorSchemeDark()) {
         await set(Config.themeDark, true);
       } else {
         await set(Config.themeLight, true);
@@ -523,7 +532,7 @@ ConfigEvent.subscribe(async (eventKey, eventValue, nosave) => {
   if (eventKey === "customBackgroundSize") applyCustomBackgroundSize();
   if (eventKey === "autoSwitchTheme") {
     if (eventValue as boolean) {
-      if (window.matchMedia?.("(prefers-color-scheme: dark)").matches) {
+      if (prefersColorSchemeDark()) {
         await set(Config.themeDark, true);
       } else {
         await set(Config.themeLight, true);
@@ -535,7 +544,7 @@ ConfigEvent.subscribe(async (eventKey, eventValue, nosave) => {
   if (
     eventKey === "themeLight" &&
     Config.autoSwitchTheme &&
-    !window.matchMedia?.("(prefers-color-scheme: dark)").matches &&
+    !prefersColorSchemeDark() &&
     !nosave
   ) {
     await set(Config.themeLight, true);
@@ -569,3 +578,7 @@ window.addEventListener("customBackgroundFailed", () => {
     { duration: 5 }
   );
 });
+
+function prefersColorSchemeDark(): boolean {
+  return window.matchMedia?.("(prefers-color-scheme: dark)").matches;
+}
diff --git a/frontend/src/ts/elements/account/result-filters.ts b/frontend/src/ts/elements/account/result-filters.ts
index 93974b3aef63..9848c4ac1ef8 100644
--- a/frontend/src/ts/elements/account/result-filters.ts
+++ b/frontend/src/ts/elements/account/result-filters.ts
@@ -179,7 +179,9 @@ function addFilterPresetToSnapshot(filter: ResultFilters): void {
 }
 
 // callback function called by popup once user inputs name
-export async function createFilterPreset(name: string): Promise<void> {
+export async function createFilterPreset(
+  name: string
+): Promise<number | undefined> {
   name = name.replace(/ /g, "_");
   Loader.show();
   const result = await Ape.users.addResultFilterPreset({
@@ -189,13 +191,10 @@ export async function createFilterPreset(name: string): Promise<void> {
   if (result.status === 200) {
     addFilterPresetToSnapshot({ ...filters, name, _id: result.body.data });
     void updateFilterPresets();
-    Notifications.add("Filter preset created", 1);
+    return 1;
   } else {
-    Notifications.add(
-      "Error creating filter preset: " + result.body.message,
-      -1
-    );
     console.log("error creating filter preset: " + result.body.message);
+    return 0;
   }
 }
 
diff --git a/frontend/src/ts/elements/no-css.ts b/frontend/src/ts/elements/no-css.ts
index 5f24ce633c2e..0bb3ac546264 100644
--- a/frontend/src/ts/elements/no-css.ts
+++ b/frontend/src/ts/elements/no-css.ts
@@ -1,4 +1,4 @@
-import { envConfig } from "../constants/env-config";
+import { envConfig } from "virtual:env-config";
 
 $("#nocss .requestedStylesheets").html(
   "Requested stylesheets:<br>" +
diff --git a/frontend/src/ts/event-handlers/footer.ts b/frontend/src/ts/event-handlers/footer.ts
index 4e047b6fbade..88bcad26e4b5 100644
--- a/frontend/src/ts/event-handlers/footer.ts
+++ b/frontend/src/ts/event-handlers/footer.ts
@@ -6,7 +6,7 @@ import * as Commandline from "../commandline/commandline";
 import * as SupportPopup from "../modals/support";
 import * as ContactModal from "../modals/contact";
 import * as VersionHistoryModal from "../modals/version-history";
-import { envConfig } from "../constants/env-config";
+import { envConfig } from "virtual:env-config";
 import { COMPATIBILITY_CHECK } from "@monkeytype/contracts";
 import { lastSeenServerCompatibility } from "../ape/adapters/ts-rest-adapter";
 
diff --git a/frontend/src/ts/modals/dev-options.ts b/frontend/src/ts/modals/dev-options.ts
index 6bf3234f4f24..5aa4bcb3c1c7 100644
--- a/frontend/src/ts/modals/dev-options.ts
+++ b/frontend/src/ts/modals/dev-options.ts
@@ -1,4 +1,4 @@
-import { envConfig } from "../constants/env-config";
+import { envConfig } from "virtual:env-config";
 import AnimatedModal from "../utils/animated-modal";
 import { showPopup } from "./simple-modals";
 import * as Notifications from "../elements/notifications";
diff --git a/frontend/src/ts/modals/new-filter-preset.ts b/frontend/src/ts/modals/new-filter-preset.ts
index 31c3e51c95f8..828c2e3d9bb5 100644
--- a/frontend/src/ts/modals/new-filter-preset.ts
+++ b/frontend/src/ts/modals/new-filter-preset.ts
@@ -1,41 +1,35 @@
+import { ResultFiltersSchema } from "@monkeytype/schemas/users";
 import { createFilterPreset } from "../elements/account/result-filters";
-import AnimatedModal, { ShowOptions } from "../utils/animated-modal";
-import * as Notifications from "../elements/notifications";
+import { SimpleModal } from "../utils/simple-modal";
 
-export function show(showOptions?: ShowOptions): void {
-  void modal.show({
-    ...showOptions,
-    focusFirstInput: true,
-    beforeAnimation: async (modalEl) => {
-      (modalEl.querySelector("input") as HTMLInputElement).value = "";
-    },
-  });
-}
-
-function hide(clearChain = false): void {
-  void modal.hide({
-    clearModalChain: clearChain,
-  });
+export function show(): void {
+  newFilterPresetModal.show(undefined, {});
 }
 
-function apply(): void {
-  const name = $("#newFilterPresetModal input").val() as string;
-  if (name === "") {
-    Notifications.add("Name cannot be empty", 0);
-    return;
-  }
-  void createFilterPreset(name);
-  hide(true);
-}
-
-async function setup(modalEl: HTMLElement): Promise<void> {
-  modalEl.addEventListener("submit", (e) => {
-    e.preventDefault();
-    apply();
-  });
-}
+const newFilterPresetModal = new SimpleModal({
+  id: "newFilterPresetModal",
+  title: "New Filter Preset",
+  inputs: [
+    {
+      placeholder: "Preset Name",
+      type: "text",
+      initVal: "",
+      validation: {
+        schema: ResultFiltersSchema.shape.name,
+      },
+    },
+  ],
+  buttonText: "add",
+  onlineOnly: true,
+  execFn: async (_thisPopup, name) => {
+    const status = await createFilterPreset(name);
 
-const modal = new AnimatedModal({
-  dialogId: "newFilterPresetModal",
-  setup,
+    if (status === 1) {
+      return { status: 1, message: "Filter preset created" };
+    } else {
+      let status: -1 | 0 | 1 = -1;
+      let message: string = "Error creating filter preset";
+      return { status, message, alwaysHide: true };
+    }
+  },
 });
diff --git a/frontend/src/ts/pages/leaderboards.ts b/frontend/src/ts/pages/leaderboards.ts
index 888f6a3ac3c1..2c489faf8d0a 100644
--- a/frontend/src/ts/pages/leaderboards.ts
+++ b/frontend/src/ts/pages/leaderboards.ts
@@ -501,7 +501,7 @@ function buildWeeklyTableRow(
   }
   element.dataset["uid"] = entry.uid;
   element.innerHTML = `
-      <td></td>
+      <td>${formatRank(entry.friendsRank)}</td>
       <td>${formatRank(entry.rank)}</td>
       <td>
         <div class="avatarNameBadge">
@@ -766,9 +766,13 @@ function fillUser(): void {
     }
 
     const userData = state.userData;
-    const percentile = (userData.rank / state.count) * 100;
+    const rank = state.friendsOnly
+      ? (userData.friendsRank as number)
+      : userData.rank;
+    const percentile = (rank / state.count) * 100;
+
     let percentileString = `Top ${percentile.toFixed(2)}%`;
-    if (userData.rank === 1) {
+    if (rank === 1) {
       percentileString = "GOAT";
     }
 
@@ -805,7 +809,7 @@ function fillUser(): void {
     };
 
     const html = `
-          <div class="rank">${formatRank(userData.rank)}</div>
+          <div class="rank">${formatRank(rank)}</div>
         <div class="userInfo">
           <div class="top">You (${percentileString})</div>
           <div class="bottom">${diffText}</div>
@@ -925,7 +929,6 @@ function updateFriendsButtons(): void {
     ".page.pageLeaderboards .buttonGroup.friendsOnlyButtons"
   );
   if (
-    state.type === "allTime" &&
     isAuthenticated() &&
     (ServerConfiguration.get()?.connections.enabled ?? false)
   ) {
@@ -1409,11 +1412,9 @@ $(".page.pageLeaderboards .buttonGroup.typeButtons").on(
     if (state.type === "daily") {
       state.language = "english";
       state.yesterday = false;
-      state.friendsOnly = false;
     }
     if (state.type === "weekly") {
       state.lastWeek = false;
-      state.friendsOnly = false;
     }
     checkIfLeaderboardIsValid();
     state.data = null;
diff --git a/frontend/src/ts/sentry.ts b/frontend/src/ts/sentry.ts
index 5ac6d5eb600a..d07fc8680272 100644
--- a/frontend/src/ts/sentry.ts
+++ b/frontend/src/ts/sentry.ts
@@ -1,4 +1,4 @@
-import { envConfig } from "./constants/env-config";
+import { envConfig } from "virtual:env-config";
 
 async function getSentry(): Promise<typeof import("@sentry/browser")> {
   return await import("@sentry/browser");
diff --git a/frontend/src/ts/test/test-stats.ts b/frontend/src/ts/test/test-stats.ts
index 5246d2ebf609..3ca8ae18a7f2 100644
--- a/frontend/src/ts/test/test-stats.ts
+++ b/frontend/src/ts/test/test-stats.ts
@@ -138,11 +138,18 @@ export function setInvalid(): void {
 }
 
 export function calculateTestSeconds(now?: number): number {
-  if (now === undefined) {
-    return (end - start) / 1000;
-  } else {
-    return (now - start) / 1000;
+  let duration = (end - start) / 1000;
+
+  if (now !== undefined) {
+    duration = (now - start) / 1000;
+  }
+
+  if (Config.mode === "zen" && duration < 0) {
+    duration = 0;
+    console.log("Zen mode with negative duration detected, setting to 0");
   }
+
+  return duration;
 }
 
 export function calculateWpmAndRaw(
diff --git a/frontend/src/ts/utils/misc.ts b/frontend/src/ts/utils/misc.ts
index 12a00c6b75e6..3138492a81a8 100644
--- a/frontend/src/ts/utils/misc.ts
+++ b/frontend/src/ts/utils/misc.ts
@@ -1,5 +1,5 @@
 import * as Loader from "../elements/loader";
-import { envConfig } from "../constants/env-config";
+import { envConfig } from "virtual:env-config";
 import { lastElementFromArray } from "./arrays";
 import { Config } from "@monkeytype/schemas/configs";
 import { Mode, Mode2, PersonalBests } from "@monkeytype/schemas/shared";
diff --git a/frontend/src/ts/virtual-env-config.d.ts b/frontend/src/ts/virtual-env-config.d.ts
new file mode 100644
index 000000000000..0f2d1b465f8b
--- /dev/null
+++ b/frontend/src/ts/virtual-env-config.d.ts
@@ -0,0 +1,12 @@
+export type EnvConfig = {
+  backendUrl: string;
+  isDevelopment: boolean;
+  clientVersion: string;
+  recaptchaSiteKey: string;
+  quickLoginEmail: string | undefined;
+  quickLoginPassword: string | undefined;
+};
+
+declare module "virtual:env-config" {
+  export const envConfig: EnvConfig;
+}
diff --git a/frontend/src/ts/module.d.ts b/frontend/src/ts/virtual-language-hashes.d.ts
similarity index 100%
rename from frontend/src/ts/module.d.ts
rename to frontend/src/ts/virtual-language-hashes.d.ts
diff --git a/frontend/static/languages/code_jule.json b/frontend/static/languages/code_jule.json
index bd00e90c9ca0..97d447de3a24 100644
--- a/frontend/static/languages/code_jule.json
+++ b/frontend/static/languages/code_jule.json
@@ -40,17 +40,20 @@
     "u64",
     "f32",
     "f64",
+    "cmplx64",
+    "cmplx128",
     "bool",
     "str",
+    "any",
     "byte",
     "rune",
-    "static",
     "const",
     "mut",
     "self",
     "true",
     "false",
     "nil",
+    "iota",
     "#build",
     "#typedef",
     "#cdef",
diff --git a/frontend/static/languages/hungarian.json b/frontend/static/languages/hungarian.json
index ae3a874598d4..60cf3cbbee55 100644
--- a/frontend/static/languages/hungarian.json
+++ b/frontend/static/languages/hungarian.json
@@ -1,94 +1,207 @@
 {
   "name": "hungarian",
+  "orderedByFrequency": false,
   "bcp47": "hu-HU",
   "words": [
-    "lapát",
-    "vödör",
-    "fuss",
-    "játék",
-    "nap",
-    "hold",
-    "éjszaka",
-    "reggel",
-    "délután",
-    "címke",
-    "ugrás",
-    "kosár",
-    "kosárlabda",
-    "eszik",
-    "csokoládé",
-    "palacsinta",
-    "labda",
-    "teniszlabda",
-    "denevér",
-    "fejlesztő",
-    "busz",
-    "pilóta",
-    "desszert",
-    "egér",
-    "kutya",
-    "macska",
-    "ital",
-    "villa",
-    "kanál",
-    "kés",
-    "táska",
-    "iskola",
-    "ceruza",
-    "szín",
-    "ebéd",
-    "reggeli",
-    "vacsora",
-    "falatozás",
-    "pénztárca",
-    "fürdőszoba",
-    "mosogató",
-    "kád",
-    "zuhany",
-    "kazán",
-    "mosógép",
-    "mosó",
-    "szárítógép",
-    "száraz",
-    "lány",
-    "fiú",
-    "férfi",
-    "női",
-    "ők",
-    "őket",
-    "csinál",
-    "bor",
-    "víz",
-    "kávé",
-    "sör",
-    "nehéz",
-    "könnyű",
-    "csúnya",
-    "gyönyörű",
-    "szép",
-    "rossz",
+    "a",
+    "abban",
+    "adott",
+    "ahogy",
+    "ahol",
+    "akár",
+    "aki",
+    "akik",
+    "akkor",
+    "alapján",
+    "alatt",
+    "áll",
+    "által",
+    "amely",
+    "amelyek",
+    "ami",
+    "amikor",
+    "amit",
+    "annak",
+    "arra",
+    "arról",
+    "át",
+    "az",
+    "azért",
+    "azok",
+    "azonban",
+    "azt",
+    "aztán",
+    "azzal",
+    "bár",
+    "be",
+    "belül",
+    "benne",
+    "című",
+    "csak",
+    "de",
+    "ebben",
+    "egész",
+    "egy",
+    "egyéb",
+    "egyes",
+    "egyik",
+    "egyre",
+    "együtt",
+    "el",
+    "elég",
+    "ellen",
+    "előtt",
+    "első",
+    "ember",
+    "emberek",
+    "én",
+    "ennek",
+    "éppen",
+    "erre",
+    "és",
+    "esetben",
+    "esetén",
+    "év",
+    "éves",
+    "ez",
+    "ezek",
+    "ezen",
+    "ezért",
+    "ezt",
+    "ezzel",
+    "fel",
+    "fog",
+    "fontos",
+    "ha",
+    "hanem",
+    "három",
+    "hiszen",
+    "hogy",
+    "hozzá",
+    "igen",
+    "így",
+    "illetve",
+    "ilyen",
+    "inkább",
+    "is",
+    "itt",
+    "jelent",
     "jó",
+    "jobb",
+    "jól",
+    "kell",
+    "kellett",
+    "került",
+    "két",
+    "ki",
+    "kicsit",
+    "kis",
+    "következő",
+    "között",
+    "közül",
+    "különböző",
+    "le",
+    "legalább",
+    "legnagyobb",
+    "legyen",
+    "lehet",
+    "lenne",
+    "lesz",
+    "lett",
+    "ma",
+    "maga",
+    "magát",
+    "magyar",
+    "majd",
+    "már",
+    "más",
+    "másik",
+    "második",
+    "meg",
+    "még",
+    "megfelelő",
+    "mellett",
+    "mely",
+    "mert",
+    "mi",
+    "miatt",
+    "miért",
+    "milyen",
+    "mind",
+    "minden",
+    "mindenki",
+    "mindig",
+    "mint",
+    "mit",
+    "mivel",
+    "módon",
+    "mondta",
+    "most",
     "nagy",
-    "kicsi",
-    "bocsánat",
-    "szívesen",
-    "köszönöm",
-    "igen",
+    "nagyobb",
+    "nagyon",
+    "nap",
+    "ne",
+    "néhány",
+    "nekem",
+    "neki",
+    "nélkül",
     "nem",
-    "viszontlátásra",
-    "viszlát",
-    "szia",
-    "szervusz",
-    "káröröm",
-    "ordít",
-    "csendes",
-    "hangos",
-    "elmosolyodik",
-    "bezzeg",
-    "megcsörget",
-    "ügyeskedő",
-    "rosszarcú",
-    "meghazudtol",
-    "szöszmötöl"
+    "nincs",
+    "olyan",
+    "óta",
+    "ott",
+    "ő",
+    "őket",
+    "pedig",
+    "például",
+    "persze",
+    "program",
+    "rá",
+    "rendszer",
+    "részt",
+    "s",
+    "saját",
+    "se",
+    "sem",
+    "semmi",
+    "sok",
+    "során",
+    "számára",
+    "szerint",
+    "szó",
+    "szükséges",
+    "található",
+    "talán",
+    "te",
+    "tehát",
+    "teljes",
+    "teljesen",
+    "tovább",
+    "több",
+    "tud",
+    "tudja",
+    "tudom",
+    "túl",
+    "úgy",
+    "ugyanis",
+    "új",
+    "újra",
+    "után",
+    "vagy",
+    "vagyok",
+    "valaki",
+    "valami",
+    "valamint",
+    "való",
+    "van",
+    "vannak",
+    "vele",
+    "világ",
+    "viszont",
+    "vissza",
+    "volna",
+    "volt",
+    "voltak"
   ]
 }
diff --git a/frontend/static/languages/hungarian_1k.json b/frontend/static/languages/hungarian_1k.json
new file mode 100644
index 000000000000..b3cf49ce3540
--- /dev/null
+++ b/frontend/static/languages/hungarian_1k.json
@@ -0,0 +1,1007 @@
+{
+  "name": "hungarian_1k",
+  "orderedByFrequency": false,
+  "bcp47": "hu-HU",
+  "words": [
+    "a",
+    "abban",
+    "abból",
+    "ad",
+    "adatok",
+    "adatokat",
+    "addig",
+    "adja",
+    "adminisztrátor",
+    "adni",
+    "adott",
+    "adta",
+    "ahhoz",
+    "ahogy",
+    "ahol",
+    "akar",
+    "akár",
+    "akarja",
+    "aki",
+    "akik",
+    "akiknek",
+    "akinek",
+    "akit",
+    "akkor",
+    "aktuális",
+    "alá",
+    "alábbi",
+    "alacsony",
+    "alakult",
+    "alapján",
+    "alapvető",
+    "alatt",
+    "alig",
+    "alkalmas",
+    "alkalommal",
+    "áll",
+    "állam",
+    "állami",
+    "állandó",
+    "állapotban",
+    "állnak",
+    "álló",
+    "állt",
+    "által",
+    "általában",
+    "általános",
+    "ám",
+    "amely",
+    "amelyben",
+    "amelyek",
+    "amelyeket",
+    "amelyet",
+    "amelynek",
+    "amennyiben",
+    "amerikai",
+    "ami",
+    "amíg",
+    "amikor",
+    "aminek",
+    "amint",
+    "amire",
+    "amit",
+    "angol",
+    "annak",
+    "annál",
+    "anyag",
+    "anyagi",
+    "anyagok",
+    "annyi",
+    "annyira",
+    "annyit",
+    "ára",
+    "arra",
+    "arról",
+    "át",
+    "attól",
+    "augusztus",
+    "autó",
+    "az",
+    "azaz",
+    "azért",
+    "azok",
+    "azokat",
+    "azoknak",
+    "azon",
+    "azonban",
+    "azonnal",
+    "azonos",
+    "azóta",
+    "azt",
+    "aztán",
+    "azzal",
+    "baj",
+    "bár",
+    "bármely",
+    "bármilyen",
+    "be",
+    "bele",
+    "belőle",
+    "belső",
+    "belül",
+    "benne",
+    "bennünket",
+    "beteg",
+    "betű",
+    "bizonyos",
+    "bizottság",
+    "biztonsági",
+    "biztos",
+    "biztosan",
+    "Budapest",
+    "Budapesten",
+    "budapesti",
+    "cég",
+    "cégek",
+    "cél",
+    "célja",
+    "cikk",
+    "cím",
+    "címet",
+    "címmel",
+    "című",
+    "civil",
+    "csak",
+    "család",
+    "családi",
+    "csapat",
+    "csoport",
+    "csupán",
+    "darab",
+    "de",
+    "december",
+    "digitális",
+    "díj",
+    "dolgok",
+    "dolgokat",
+    "dolgot",
+    "dolog",
+    "ebben",
+    "ebből",
+    "eddig",
+    "eddigi",
+    "egész",
+    "egészen",
+    "egészségügyi",
+    "egy",
+    "egyáltalán",
+    "egyaránt",
+    "egyben",
+    "egyéb",
+    "egyébként",
+    "egyedi",
+    "egyedül",
+    "egyelőre",
+    "egyéni",
+    "egyes",
+    "egyesült",
+    "egyet",
+    "egyetemi",
+    "egyetlen",
+    "egyik",
+    "egymás",
+    "egymással",
+    "egymást",
+    "egyre",
+    "egységes",
+    "egyszer",
+    "egyszerre",
+    "egyszerű",
+    "egyszerűen",
+    "együtt",
+    "ehhez",
+    "ekkor",
+    "el",
+    "él",
+    "eladó",
+    "elé",
+    "elég",
+    "elején",
+    "elektronikus",
+    "elérhető",
+    "élet",
+    "élete",
+    "életét",
+    "eljárás",
+    "ellen",
+    "ellenére",
+    "elleni",
+    "elmondta",
+    "elmúlt",
+    "elnök",
+    "elnöke",
+    "elő",
+    "élő",
+    "előbb",
+    "előre",
+    "először",
+    "előtt",
+    "előtti",
+    "előzetes",
+    "előző",
+    "első",
+    "elsősorban",
+    "eltérő",
+    "e-mail",
+    "ember",
+    "emberek",
+    "emberi",
+    "embert",
+    "említett",
+    "én",
+    "engem",
+    "ennek",
+    "ennél",
+    "ennyi",
+    "épp",
+    "éppen",
+    "épület",
+    "érdekében",
+    "érdekel",
+    "érdekes",
+    "érdemes",
+    "eredeti",
+    "érkezett",
+    "erős",
+    "erre",
+    "erről",
+    "ért",
+    "érte",
+    "értem",
+    "érvényes",
+    "és",
+    "esetben",
+    "esetében",
+    "esetén",
+    "esetleg",
+    "esett",
+    "esik",
+    "este",
+    "eszközök",
+    "észre",
+    "ettől",
+    "Európa",
+    "európai",
+    "év",
+    "évben",
+    "éve",
+    "évek",
+    "években",
+    "éves",
+    "évi",
+    "évre",
+    "évvel",
+    "ez",
+    "ezek",
+    "ezeket",
+    "ezelőtt",
+    "ezen",
+    "ezer",
+    "ezért",
+    "ezt",
+    "ezzel",
+    "fehér",
+    "fekete",
+    "fel",
+    "fél",
+    "feladat",
+    "feladata",
+    "feladatok",
+    "felé",
+    "felett",
+    "felhasználó",
+    "felhasználók",
+    "feltételek",
+    "feltétlenül",
+    "fenntartva",
+    "fenti",
+    "férfi",
+    "fiatal",
+    "fiatalok",
+    "figyelembe",
+    "figyelmet",
+    "film",
+    "fizikai",
+    "fog",
+    "fogja",
+    "fognak",
+    "folyamatos",
+    "folyamatosan",
+    "fontos",
+    "forint",
+    "forintot",
+    "formában",
+    "fórum",
+    "fő",
+    "föl",
+    "főleg",
+    "francia",
+    "függ",
+    "függetlenül",
+    "gazdasági",
+    "gép",
+    "gond",
+    "gondolom",
+    "gondoltam",
+    "gyakorlati",
+    "gyakran",
+    "gyerek",
+    "gyerekek",
+    "gyermek",
+    "gyors",
+    "gyorsan",
+    "ha",
+    "háború",
+    "had",
+    "hagyományos",
+    "hamarosan",
+    "hanem",
+    "harmadik",
+    "három",
+    "hasonló",
+    "hasonlóan",
+    "használata",
+    "használható",
+    "használni",
+    "használt",
+    "hasznos",
+    "hat",
+    "hát",
+    "hatalmas",
+    "ház",
+    "haza",
+    "hazai",
+    "hely",
+    "helyen",
+    "helyes",
+    "helyet",
+    "helyett",
+    "helyezett",
+    "helyi",
+    "helyzet",
+    "hét",
+    "héten",
+    "hiba",
+    "hírek",
+    "hirtelen",
+    "hisz",
+    "hiszem",
+    "hiszen",
+    "hivatalos",
+    "hogy",
+    "hogyan",
+    "hol",
+    "hónap",
+    "hosszú",
+    "hozott",
+    "hozzá",
+    "hozzászólások",
+    "ide",
+    "idegen",
+    "idei",
+    "ideig",
+    "ideje",
+    "idején",
+    "idén",
+    "idő",
+    "időben",
+    "időt",
+    "igaz",
+    "igazán",
+    "igazi",
+    "igen",
+    "igénybe",
+    "így",
+    "illeti",
+    "illetve",
+    "ilyen",
+    "Imre",
+    "indul",
+    "indult",
+    "információ",
+    "információk",
+    "ingyenes",
+    "inkább",
+    "internet",
+    "internetes",
+    "intézmény",
+    "intézmények",
+    "iránt",
+    "írd",
+    "írja",
+    "írni",
+    "írt",
+    "írta",
+    "írtam",
+    "is",
+    "iskola",
+    "iskolai",
+    "ismert",
+    "ismét",
+    "itt",
+    "ja",
+    "János",
+    "január",
+    "jár",
+    "járó",
+    "járt",
+    "játék",
+    "jelen",
+    "jelenik",
+    "jelenleg",
+    "jelenlegi",
+    "jelent",
+    "jelentette",
+    "jelenti",
+    "jelentős",
+    "jellegű",
+    "jellemző",
+    "jó",
+    "jobb",
+    "jobban",
+    "jog",
+    "jogi",
+    "jól",
+    "jóval",
+    "jön",
+    "jött",
+    "jövő",
+    "jövőben",
+    "június",
+    "jut",
+    "jutott",
+    "kap",
+    "kapcsán",
+    "kapcsolat",
+    "kapcsolatban",
+    "kapcsolatos",
+    "kapcsolatot",
+    "kapcsolódó",
+    "kapott",
+    "kedves",
+    "kell",
+    "kellene",
+    "kellett",
+    "kéne",
+    "kép",
+    "képek",
+    "képes",
+    "képesek",
+    "képest",
+    "képet",
+    "képviselő",
+    "kérdés",
+    "keres",
+    "kereskedelmi",
+    "keresztény",
+    "keresztül",
+    "keretében",
+    "kérjük",
+    "kerül",
+    "került",
+    "később",
+    "kész",
+    "készített",
+    "készül",
+    "készült",
+    "két",
+    "kevés",
+    "kevésbé",
+    "kevesebb",
+    "kezdve",
+    "ki",
+    "kicsit",
+    "király",
+    "kis",
+    "kisebb",
+    "kissé",
+    "kiváló",
+    "kívül",
+    "kizárólag",
+    "komoly",
+    "konkrét",
+    "korábban",
+    "korábbi",
+    "kormány",
+    "könnyen",
+    "könnyű",
+    "könyv",
+    "körében",
+    "körül",
+    "körülmények",
+    "köszönhetően",
+    "köteles",
+    "kötelező",
+    "kötött",
+    "következő",
+    "következtében",
+    "követő",
+    "követően",
+    "közben",
+    "közé",
+    "közel",
+    "közös",
+    "között",
+    "közötti",
+    "központi",
+    "közt",
+    "közül",
+    "közvetlen",
+    "közvetlenül",
+    "kulturális",
+    "külföldi",
+    "külön",
+    "különböző",
+    "különféle",
+    "különleges",
+    "különös",
+    "különösen",
+    "külső",
+    "lány",
+    "lap",
+    "lassan",
+    "látható",
+    "látja",
+    "látni",
+    "látogató",
+    "látom",
+    "látszik",
+    "láttam",
+    "le",
+    "legalább",
+    "legalábbis",
+    "legfeljebb",
+    "legfontosabb",
+    "leginkább",
+    "legjobb",
+    "legnagyobb",
+    "legtöbb",
+    "legújabb",
+    "legyen",
+    "lehet",
+    "lehetett",
+    "lehetne",
+    "lehetnek",
+    "lehetőség",
+    "lehetőséget",
+    "lehetővé",
+    "lehetséges",
+    "lenne",
+    "lenni",
+    "lép",
+    "lesz",
+    "lesznek",
+    "létezik",
+    "létre",
+    "lett",
+    "lévő",
+    "ma",
+    "maga",
+    "magad",
+    "magam",
+    "magának",
+    "magas",
+    "magasabb",
+    "magát",
+    "magukat",
+    "magyar",
+    "Magyarország",
+    "magyarországi",
+    "Magyarországon",
+    "mai",
+    "majd",
+    "majdnem",
+    "május",
+    "mar",
+    "már",
+    "marad",
+    "maradt",
+    "március",
+    "máris",
+    "más",
+    "másik",
+    "második",
+    "mások",
+    "mást",
+    "meg",
+    "még",
+    "megfelelő",
+    "megfelelően",
+    "meghatározott",
+    "megint",
+    "mégis",
+    "megjelenő",
+    "megjelent",
+    "megoldás",
+    "megy",
+    "megyei",
+    "meleg",
+    "mellé",
+    "mellett",
+    "mely",
+    "melyek",
+    "melyet",
+    "melyik",
+    "melynek",
+    "menni",
+    "ment",
+    "mennyire",
+    "mert",
+    "mértékben",
+    "mi",
+    "miatt",
+    "miért",
+    "míg",
+    "mikor",
+    "miközben",
+    "milyen",
+    "mind",
+    "minden",
+    "mindenki",
+    "mindenkinek",
+    "mindent",
+    "mindig",
+    "mindkét",
+    "mindössze",
+    "minél",
+    "miniszter",
+    "minket",
+    "mint",
+    "mintegy",
+    "mintha",
+    "mire",
+    "mit",
+    "miután",
+    "mivel",
+    "modern",
+    "módon",
+    "mondani",
+    "mondja",
+    "mondjuk",
+    "mondom",
+    "mondta",
+    "most",
+    "mögött",
+    "múlt",
+    "múlva",
+    "munka",
+    "munkát",
+    "mutatja",
+    "működik",
+    "működő",
+    "műszaki",
+    "na",
+    "nagy",
+    "nagyobb",
+    "nagyon",
+    "nálunk",
+    "nap",
+    "napi",
+    "napig",
+    "napja",
+    "napon",
+    "ne",
+    "négy",
+    "néha",
+    "néhány",
+    "nehéz",
+    "nehezen",
+    "neked",
+    "nekem",
+    "neki",
+    "nekik",
+    "nekünk",
+    "nélkül",
+    "nélküli",
+    "nem",
+    "nemcsak",
+    "német",
+    "némi",
+    "nemzeti",
+    "nemzetközi",
+    "név",
+    "neve",
+    "nevét",
+    "nevű",
+    "nincs",
+    "nincsenek",
+    "november",
+    "nő",
+    "női",
+    "nők",
+    "nyelv",
+    "nyílt",
+    "nyújt",
+    "oda",
+    "oka",
+    "oktatási",
+    "október",
+    "olasz",
+    "oldal",
+    "oldalon",
+    "oly",
+    "olyan",
+    "online",
+    "operációs",
+    "óra",
+    "ország",
+    "országban",
+    "országos",
+    "óta",
+    "ott",
+    "otthon",
+    "ő",
+    "ők",
+    "őket",
+    "ön",
+    "önálló",
+    "önkormányzat",
+    "önkormányzati",
+    "össze",
+    "összes",
+    "összesen",
+    "öt",
+    "őt",
+    "pár",
+    "pedig",
+    "például",
+    "pénz",
+    "pénzt",
+    "pénzügyi",
+    "perc",
+    "persze",
+    "piaci",
+    "polgári",
+    "politikai",
+    "pont",
+    "pontos",
+    "pontosan",
+    "pozitív",
+    "probléma",
+    "program",
+    "programok",
+    "programot",
+    "rá",
+    "ráadásul",
+    "rajta",
+    "reggel",
+    "régi",
+    "regisztrált",
+    "rendelet",
+    "rendelkezésre",
+    "rendelkezik",
+    "rendelkező",
+    "rendkívül",
+    "rendszer",
+    "rendszerek",
+    "rendszeresen",
+    "rendszert",
+    "rengeteg",
+    "rész",
+    "részben",
+    "része",
+    "részére",
+    "részét",
+    "részletes",
+    "részt",
+    "révén",
+    "róla",
+    "rossz",
+    "rövid",
+    "s",
+    "saját",
+    "sajnos",
+    "se",
+    "segítséget",
+    "segítségével",
+    "sem",
+    "semmi",
+    "semmilyen",
+    "semmit",
+    "senki",
+    "sikeres",
+    "sikerül",
+    "sikerült",
+    "sincs",
+    "soha",
+    "sok",
+    "sokan",
+    "sokat",
+    "sokkal",
+    "sokszor",
+    "sor",
+    "során",
+    "sőt",
+    "speciális",
+    "súlyos",
+    "szabad",
+    "szakmai",
+    "szám",
+    "száma",
+    "számára",
+    "számít",
+    "számos",
+    "számú",
+    "száz",
+    "század",
+    "széles",
+    "szellemi",
+    "szemben",
+    "személy",
+    "személyes",
+    "szempontból",
+    "szempontjából",
+    "szent",
+    "szép",
+    "szépen",
+    "szeptember",
+    "szerepe",
+    "szerepel",
+    "szerepet",
+    "szereplő",
+    "szeretnék",
+    "szeretném",
+    "szerint",
+    "szerintem",
+    "szerinti",
+    "szervezet",
+    "szervezetek",
+    "szerzett",
+    "szerződés",
+    "szinte",
+    "szinten",
+    "szintén",
+    "szintű",
+    "szívesen",
+    "szó",
+    "szociális",
+    "szól",
+    "szolgáltatás",
+    "szolgáltatások",
+    "szóló",
+    "szólt",
+    "szót",
+    "szóval",
+    "szükség",
+    "szükséges",
+    "született",
+    "tagja",
+    "tagjai",
+    "található",
+    "talán",
+    "támogatás",
+    "támogatást",
+    "tanár",
+    "társadalmi",
+    "társadalom",
+    "társaság",
+    "tart",
+    "tartalmaz",
+    "tartalmazó",
+    "tartalmazza",
+    "tartani",
+    "tartja",
+    "tartó",
+    "tartott",
+    "tartozik",
+    "tartozó",
+    "tavaly",
+    "te",
+    "technikai",
+    "tegnap",
+    "tehát",
+    "teljes",
+    "teljesen",
+    "téma",
+    "tenni",
+    "tényleg",
+    "tér",
+    "termék",
+    "termékek",
+    "természetes",
+    "természetesen",
+    "terület",
+    "területen",
+    "területén",
+    "tervezett",
+    "tesz",
+    "teszi",
+    "teszik",
+    "tetszik",
+    "tett",
+    "tette",
+    "tevékenység",
+    "típusú",
+    "tiszta",
+    "tíz",
+    "tovább",
+    "továbbá",
+    "további",
+    "továbbra",
+    "több",
+    "többek",
+    "többet",
+    "többi",
+    "többször",
+    "tőle",
+    "történelmi",
+    "történik",
+    "történő",
+    "történt",
+    "törvény",
+    "tud",
+    "tudja",
+    "tudják",
+    "tudjuk",
+    "tudnak",
+    "tudni",
+    "tudod",
+    "tudok",
+    "tudom",
+    "tudományos",
+    "tudott",
+    "tudsz",
+    "tudta",
+    "tudtam",
+    "tudunk",
+    "túl",
+    "tűnik",
+    "úgy",
+    "ugyan",
+    "ugyanakkor",
+    "ugyanis",
+    "ugye",
+    "új",
+    "újabb",
+    "újra",
+    "unió",
+    "úr",
+    "út",
+    "után",
+    "utána",
+    "utáni",
+    "utóbbi",
+    "utolsó",
+    "úton",
+    "üzleti",
+    "vagy",
+    "vagyis",
+    "vagyok",
+    "vagyunk",
+    "vajon",
+    "valaki",
+    "valamennyi",
+    "valami",
+    "valamilyen",
+    "valamint",
+    "valamit",
+    "válasz",
+    "választ",
+    "válik",
+    "való",
+    "valóban",
+    "valószínűleg",
+    "vált",
+    "van",
+    "vannak",
+    "vár",
+    "várható",
+    "város",
+    "vége",
+    "végén",
+    "végig",
+    "végre",
+    "végül",
+    "végzett",
+    "vele",
+    "velem",
+    "vélemény",
+    "véleményed",
+    "velük",
+    "vendég",
+    "venni",
+    "verseny",
+    "vesz",
+    "veszi",
+    "vett",
+    "vette",
+    "vezető",
+    "vezetője",
+    "világ",
+    "viszont",
+    "vissza",
+    "víz",
+    "volna",
+    "volt",
+    "voltak",
+    "voltam",
+    "vonatkozó",
+    "zene",
+    "zenei"
+  ]
+}
diff --git a/frontend/static/languages/indonesian_1k.json b/frontend/static/languages/indonesian_1k.json
index f9c0d8bc662d..5ccf30d842a9 100644
--- a/frontend/static/languages/indonesian_1k.json
+++ b/frontend/static/languages/indonesian_1k.json
@@ -443,7 +443,7 @@
     "lebih",
     "lelah",
     "lelaki",
-    "lembab",
+    "lembap",
     "lembar",
     "lembaran",
     "lembur",
diff --git a/frontend/static/quotes/code_bash.json b/frontend/static/quotes/code_bash.json
new file mode 100644
index 000000000000..5a0fefe1cb8b
--- /dev/null
+++ b/frontend/static/quotes/code_bash.json
@@ -0,0 +1,71 @@
+{
+  "language": "code_bash",
+  "groups": [
+    [0, 100],
+    [101, 300],
+    [301, 600],
+    [601, 9999]
+  ],
+  "quotes": [
+    {
+      "text": "echo \"Hello, World!\"",
+      "source": "Basic Hello World in Bash",
+      "length": 20,
+      "id": 1
+    },
+    {
+      "text": "#!/bin/bash\n\n# This script prints numbers from 1 to 10\nfor i in {1..10}\ndo\n  echo $i\ndone",
+      "source": "Looping through numbers in Bash",
+      "length": 89,
+      "id": 2
+    },
+    {
+      "text": "#!/bin/bash\n\n# Check if a file exists\nFILE=\"/path/to/file.txt\"\nif [ -f \"$FILE\" ]; then\n  echo \"$FILE exists.\"\nelse\n  echo \"$FILE does not exist.\"\nfi",
+      "source": "File existence check in Bash",
+      "length": 148,
+      "id": 3
+    },
+    {
+      "text": "#!/bin/bash\n\n# Read user input\necho \"Enter your name:\"\nread NAME\necho \"Hello, $NAME!\"",
+      "source": "Reading user input in Bash",
+      "length": 85,
+      "id": 4
+    },
+    {
+      "text": "#!/bin/bash\n\n# Function to greet a user\ngreet() {\n  echo \"Hello, $1!\"\n}\n\ngreet \"Alice\"",
+      "source": "Defining and using functions in Bash",
+      "length": 86,
+      "id": 5
+    },
+    {
+      "text": "#!/bin/bash\n\n# Using command line arguments\necho \"Script name: $0\"\necho \"First argument: $1\"\necho \"Second argument: $2\"",
+      "source": "Using command line arguments in Bash",
+      "length": 119,
+      "id": 6
+    },
+    {
+      "text": "#!/bin/bash\n\n# Simple case statement\necho \"Enter a number between 1 and 3:\"\nread NUM\ncase $NUM in\n  1)\n    echo \"You entered one.\" ;;\n  2)\n    echo \"You entered two.\" ;;\n  3)\n    echo \"You entered three.\" ;;\n  *)\n    echo \"Invalid input.\" ;;\nesac",
+      "source": "Using case statements in Bash",
+      "length": 246,
+      "id": 7
+    },
+    {
+      "text": "#!/bin/bash\n\n# Create a new directory\nNEW_DIR=\"/path/to/new_directory\"\nmkdir -p \"$NEW_DIR\"\necho \"Directory $NEW_DIR created successfully.\"",
+      "source": "Creating a new directory in Bash",
+      "length": 138,
+      "id": 8
+    },
+    {
+      "text": "#!/bin/bash\n\n# Backup a directory\nSOURCE_DIR=\"/path/to/source\"\nBACKUP_DIR=\"/path/to/backup\"\ntar -czf \"$BACKUP_DIR/backup_$(date +%F).tar.gz\" -C \"$SOURCE_DIR\" .",
+      "source": "Backing up a directory in Bash",
+      "length": 159,
+      "id": 9
+    },
+    {
+      "text": "#!/bin/bash\n\n# Monitor disk usage\ndf -h | grep '^/dev/' | while read line; do\n  USAGE=$(echo $line | awk '{print $5}' | sed 's/%//')\n  if [ $USAGE -gt 80 ]; then\n    echo \"Warning: Disk usage is at ${USAGE}%\"\n  fi\ndone",
+      "source": "Monitoring disk usage in Bash",
+      "length": 218,
+      "id": 10
+    }
+  ]
+}
diff --git a/frontend/static/quotes/code_java.json b/frontend/static/quotes/code_java.json
index f6b4971f8817..b46678b1cf4f 100644
--- a/frontend/static/quotes/code_java.json
+++ b/frontend/static/quotes/code_java.json
@@ -168,6 +168,684 @@
       "source": "BogoSort",
       "id": 27,
       "length": 222
+    },
+    {
+      "text": "String[] parts = input.split(\",\");\nfor (String part : parts) {\n\tSystem.out.println(part.trim());\n}",
+      "source": "Split String and Trim Whitespace",
+      "id": 28,
+      "length": 98
+    },
+    {
+      "text": "List<String> list = new ArrayList<>(Arrays.asList(\"apple\", \"banana\", \"cherry\"));\nlist.remove(\"banana\");\nlist.add(\"date\");",
+      "source": "ArrayList Initialization and Manipulation",
+      "id": 29,
+      "length": 121
+    },
+    {
+      "text": "Map<String, Integer> map = new HashMap<>();\nmap.put(\"key\", 100);\nint value = map.getOrDefault(\"key\", 0);\nfor (Map.Entry<String, Integer> entry : map.entrySet()) {\n\tSystem.out.println(entry.getKey() + \": \" + entry.getValue());\n}",
+      "source": "HashMap Common Operations",
+      "id": 30,
+      "length": 227
+    },
+    {
+      "text": "try {\n\tint result = Integer.parseInt(input);\n\tSystem.out.println(result);\n} catch (NumberFormatException e) {\n\tSystem.out.println(\"Invalid number: \" + e.getMessage());\n}",
+      "source": "Parse String to Integer with Error Handling",
+      "id": 31,
+      "length": 169
+    },
+    {
+      "text": "List<Integer> numbers = Arrays.asList(1, 2, 3, 4, 5);\nList<Integer> doubled = numbers.stream()\n\t.map(n -> n * 2)\n\t.filter(n -> n > 5)\n\t.collect(Collectors.toList());",
+      "source": "Stream API - Map and Filter",
+      "id": 32,
+      "length": 165
+    },
+    {
+      "text": "String json = \"{\\\"name\\\":\\\"John\\\",\\\"age\\\":30}\";\nString result = String.format(\"Name: %s, Age: %d\", name, age);\nString multiline = \"\"\"\\n\tThis is a\\n\tmulti-line\\n\ttext block\\n\t\"\"\";",
+      "source": "String Formatting and Text Blocks",
+      "id": 33,
+      "length": 178
+    },
+    {
+      "text": "public class Person {\n\tprivate String name;\n\tprivate int age;\n\t\n\tpublic Person(String name, int age) {\n\t\tthis.name = name;\n\t\tthis.age = age;\n\t}\n\t\n\tpublic String getName() { return name; }\n\tpublic void setName(String name) { this.name = name; }\n}",
+      "source": "Basic Class with Constructor and Getters/Setters",
+      "id": 34,
+      "length": 245
+    },
+    {
+      "text": "int max = Math.max(a, b);\nint min = Math.min(a, b);\ndouble sqrt = Math.sqrt(16);\ndouble power = Math.pow(2, 3);\nint random = (int)(Math.random() * 100);",
+      "source": "Common Math Operations",
+      "id": 35,
+      "length": 152
+    },
+    {
+      "text": "char[] chars = str.toCharArray();\nString upper = str.toUpperCase();\nString lower = str.toLowerCase();\nboolean startsWith = str.startsWith(\"prefix\");\nString sub = str.substring(0, 5);",
+      "source": "String Common Methods",
+      "id": 36,
+      "length": 182
+    },
+    {
+      "text": "Set<Integer> set = new HashSet<>();\nset.add(1);\nset.add(2);\nboolean contains = set.contains(1);\nset.remove(2);\nint size = set.size();",
+      "source": "HashSet Basic Operations",
+      "id": 37,
+      "length": 133
+    },
+    {
+      "text": "public static int gcd(int a, int b) {\n\tif (b == 0) return a;\n\treturn gcd(b, a % b);\n}\npublic static int lcm(int a, int b) {\n\treturn (a * b) / gcd(a, b);\n}",
+      "source": "GCD and LCM",
+      "id": 38,
+      "length": 154
+    },
+    {
+      "text": "public static boolean isPrime(int n) {\n\tif (n <= 1) return false;\n\tif (n <= 3) return true;\n\tif (n % 2 == 0 || n % 3 == 0) return false;\n\tfor (int i = 5; i * i <= n; i += 6) {\n\t\tif (n % i == 0 || n % (i + 2) == 0) return false;\n\t}\n\treturn true;\n}",
+      "source": "Check if Number is Prime",
+      "id": 39,
+      "length": 246
+    },
+    {
+      "text": "StringBuilder sb = new StringBuilder();\nsb.append(\"Hello\");\nsb.append(\" \");\nsb.append(\"World\");\nString result = sb.toString();\nsb.reverse();",
+      "source": "StringBuilder for Efficient String Concatenation",
+      "id": 40,
+      "length": 140
+    },
+    {
+      "text": "LocalDateTime now = LocalDateTime.now();\nLocalDate date = LocalDate.of(2024, 1, 1);\nLocalTime time = LocalTime.of(14, 30);\nDateTimeFormatter formatter = DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm\");",
+      "source": "Date and Time with java.time API",
+      "id": 41,
+      "length": 201
+    },
+    {
+      "text": "try (BufferedReader br = new BufferedReader(new FileReader(\"file.txt\"))) {\n\tString line;\n\twhile ((line = br.readLine()) != null) {\n\t\tSystem.out.println(line);\n\t}\n} catch (IOException e) {\n\te.printStackTrace();\n}",
+      "source": "Read File Line by Line with try-with-resources",
+      "id": 42,
+      "length": 211
+    },
+    {
+      "text": "int[] arr = {5, 2, 8, 1, 9};\nArrays.sort(arr);\nint index = Arrays.binarySearch(arr, 8);\nint[] copy = Arrays.copyOf(arr, arr.length);\nboolean equal = Arrays.equals(arr, copy);",
+      "source": "Arrays Utility Methods",
+      "id": 43,
+      "length": 174
+    },
+    {
+      "text": "List<String> list = Arrays.asList(\"a\", \"b\", \"c\");\nCollections.reverse(list);\nCollections.shuffle(list);\nCollections.sort(list);\nString max = Collections.max(list);",
+      "source": "Collections Utility Methods",
+      "id": 44,
+      "length": 163
+    },
+    {
+      "text": "public static <T> void printArray(T[] arr) {\n\tfor (T element : arr) {\n\t\tSystem.out.print(element + \" \");\n\t}\n\tSystem.out.println();\n}",
+      "source": "Generic Method Example",
+      "id": 45,
+      "length": 132
+    },
+    {
+      "text": "Queue<Integer> queue = new LinkedList<>();\nqueue.offer(1);\nqueue.offer(2);\nInteger front = queue.poll();\nInteger peek = queue.peek();\nboolean empty = queue.isEmpty();",
+      "source": "Queue Operations with LinkedList",
+      "id": 46,
+      "length": 166
+    },
+    {
+      "text": "PriorityQueue<Integer> pq = new PriorityQueue<>();\npq.offer(5);\npq.offer(1);\npq.offer(3);\nwhile (!pq.isEmpty()) {\n\tSystem.out.println(pq.poll());\n}",
+      "source": "PriorityQueue (Min Heap)",
+      "id": 47,
+      "length": 147
+    },
+    {
+      "text": "public ListNode reverseLinkedList(ListNode head) {\n\tListNode prev = null;\n\tListNode curr = head;\n\twhile (curr != null) {\n\t\tListNode next = curr.next;\n\t\tcurr.next = prev;\n\t\tprev = curr;\n\t\tcurr = next;\n\t}\n\treturn prev;\n}",
+      "source": "Reverse Linked List",
+      "id": 48,
+      "length": 218
+    },
+    {
+      "text": "public boolean hasCycle(ListNode head) {\n\tListNode slow = head, fast = head;\n\twhile (fast != null && fast.next != null) {\n\t\tslow = slow.next;\n\t\tfast = fast.next.next;\n\t\tif (slow == fast) return true;\n\t}\n\treturn false;\n}",
+      "source": "Detect Cycle in Linked List (Floyd's Algorithm)",
+      "id": 49,
+      "length": 219
+    },
+    {
+      "text": "public ListNode mergeTwoLists(ListNode l1, ListNode l2) {\n\tListNode dummy = new ListNode(0);\n\tListNode curr = dummy;\n\twhile (l1 != null && l2 != null) {\n\t\tif (l1.val < l2.val) {\n\t\t\tcurr.next = l1;\n\t\t\tl1 = l1.next;\n\t\t} else {\n\t\t\tcurr.next = l2;\n\t\t\tl2 = l2.next;\n\t\t}\n\t\tcurr = curr.next;\n\t}\n\tcurr.next = (l1 != null) ? l1 : l2;\n\treturn dummy.next;\n}",
+      "source": "Merge Two Sorted Linked Lists",
+      "id": 50,
+      "length": 346
+    },
+    {
+      "text": "public int maxSubArray(int[] nums) {\n\tint maxSum = nums[0];\n\tint currSum = nums[0];\n\tfor (int i = 1; i < nums.length; i++) {\n\t\tcurrSum = Math.max(nums[i], currSum + nums[i]);\n\t\tmaxSum = Math.max(maxSum, currSum);\n\t}\n\treturn maxSum;\n}",
+      "source": "Maximum Subarray (Kadane's Algorithm)",
+      "id": 51,
+      "length": 233
+    },
+    {
+      "text": "public int[] twoSum(int[] nums, int target) {\n\tMap<Integer, Integer> map = new HashMap<>();\n\tfor (int i = 0; i < nums.length; i++) {\n\t\tint complement = target - nums[i];\n\t\tif (map.containsKey(complement)) {\n\t\t\treturn new int[]{map.get(complement), i};\n\t\t}\n\t\tmap.put(nums[i], i);\n\t}\n\treturn new int[]{};\n}",
+      "source": "Two Sum Problem",
+      "id": 52,
+      "length": 304
+    },
+    {
+      "text": "public boolean isValid(String s) {\n\tStack<Character> stack = new Stack<>();\n\tfor (char c : s.toCharArray()) {\n\t\tif (c == '(') stack.push(')');\n\t\telse if (c == '{') stack.push('}');\n\t\telse if (c == '[') stack.push(']');\n\t\telse if (stack.isEmpty() || stack.pop() != c) return false;\n\t}\n\treturn stack.isEmpty();\n}",
+      "source": "Valid Parentheses",
+      "id": 53,
+      "length": 310
+    },
+    {
+      "text": "public int maxDepth(TreeNode root) {\n\tif (root == null) return 0;\n\treturn 1 + Math.max(maxDepth(root.left), maxDepth(root.right));\n}",
+      "source": "Maximum Depth of Binary Tree",
+      "id": 54,
+      "length": 132
+    },
+    {
+      "text": "public boolean isBalanced(TreeNode root) {\n\treturn height(root) != -1;\n}\nprivate int height(TreeNode node) {\n\tif (node == null) return 0;\n\tint left = height(node.left);\n\tif (left == -1) return -1;\n\tint right = height(node.right);\n\tif (right == -1) return -1;\n\tif (Math.abs(left - right) > 1) return -1;\n\treturn Math.max(left, right) + 1;\n}",
+      "source": "Check if Binary Tree is Balanced",
+      "id": 55,
+      "length": 339
+    },
+    {
+      "text": "public TreeNode lowestCommonAncestor(TreeNode root, TreeNode p, TreeNode q) {\n\tif (root == null || root == p || root == q) return root;\n\tTreeNode left = lowestCommonAncestor(root.left, p, q);\n\tTreeNode right = lowestCommonAncestor(root.right, p, q);\n\tif (left != null && right != null) return root;\n\treturn (left != null) ? left : right;\n}",
+      "source": "Lowest Common Ancestor in Binary Tree",
+      "id": 56,
+      "length": 339
+    },
+    {
+      "text": "public List<Integer> inorderTraversal(TreeNode root) {\n\tList<Integer> result = new ArrayList<>();\n\tStack<TreeNode> stack = new Stack<>();\n\tTreeNode curr = root;\n\twhile (curr != null || !stack.isEmpty()) {\n\t\twhile (curr != null) {\n\t\t\tstack.push(curr);\n\t\t\tcurr = curr.left;\n\t\t}\n\t\tcurr = stack.pop();\n\t\tresult.add(curr.val);\n\t\tcurr = curr.right;\n\t}\n\treturn result;\n}",
+      "source": "Binary Tree Inorder Traversal (Iterative)",
+      "id": 57,
+      "length": 363
+    },
+    {
+      "text": "public List<List<Integer>> levelOrder(TreeNode root) {\n\tList<List<Integer>> result = new ArrayList<>();\n\tif (root == null) return result;\n\tQueue<TreeNode> queue = new LinkedList<>();\n\tqueue.offer(root);\n\twhile (!queue.isEmpty()) {\n\t\tint size = queue.size();\n\t\tList<Integer> level = new ArrayList<>();\n\t\tfor (int i = 0; i < size; i++) {\n\t\t\tTreeNode node = queue.poll();\n\t\t\tlevel.add(node.val);\n\t\t\tif (node.left != null) queue.offer(node.left);\n\t\t\tif (node.right != null) queue.offer(node.right);\n\t\t}\n\t\tresult.add(level);\n\t}\n\treturn result;\n}",
+      "source": "Binary Tree Level Order Traversal (BFS)",
+      "id": 58,
+      "length": 540
+    },
+    {
+      "text": "public void dfs(int[][] grid, int i, int j) {\n\tif (i < 0 || i >= grid.length || j < 0 || j >= grid[0].length || grid[i][j] == 0) return;\n\tgrid[i][j] = 0;\n\tdfs(grid, i+1, j);\n\tdfs(grid, i-1, j);\n\tdfs(grid, i, j+1);\n\tdfs(grid, i, j-1);\n}",
+      "source": "DFS on 2D Grid (Number of Islands Pattern)",
+      "id": 59,
+      "length": 235
+    },
+    {
+      "text": "public int climbStairs(int n) {\n\tif (n <= 2) return n;\n\tint[] dp = new int[n + 1];\n\tdp[1] = 1;\n\tdp[2] = 2;\n\tfor (int i = 3; i <= n; i++) {\n\t\tdp[i] = dp[i-1] + dp[i-2];\n\t}\n\treturn dp[n];\n}",
+      "source": "Climbing Stairs (Dynamic Programming)",
+      "id": 60,
+      "length": 187
+    },
+    {
+      "text": "public int coinChange(int[] coins, int amount) {\n\tint[] dp = new int[amount + 1];\n\tArrays.fill(dp, amount + 1);\n\tdp[0] = 0;\n\tfor (int i = 1; i <= amount; i++) {\n\t\tfor (int coin : coins) {\n\t\t\tif (i >= coin) {\n\t\t\t\tdp[i] = Math.min(dp[i], dp[i - coin] + 1);\n\t\t\t}\n\t\t}\n\t}\n\treturn dp[amount] > amount ? -1 : dp[amount];\n}",
+      "source": "Coin Change Problem (DP)",
+      "id": 61,
+      "length": 315
+    },
+    {
+      "text": "public int lengthOfLIS(int[] nums) {\n\tint[] dp = new int[nums.length];\n\tArrays.fill(dp, 1);\n\tfor (int i = 1; i < nums.length; i++) {\n\t\tfor (int j = 0; j < i; j++) {\n\t\t\tif (nums[i] > nums[j]) {\n\t\t\t\tdp[i] = Math.max(dp[i], dp[j] + 1);\n\t\t\t}\n\t\t}\n\t}\n\treturn Arrays.stream(dp).max().orElse(0);\n}",
+      "source": "Longest Increasing Subsequence (DP)",
+      "id": 62,
+      "length": 289
+    },
+    {
+      "text": "public int rob(int[] nums) {\n\tif (nums.length == 0) return 0;\n\tif (nums.length == 1) return nums[0];\n\tint prev2 = 0, prev1 = 0;\n\tfor (int num : nums) {\n\t\tint temp = prev1;\n\t\tprev1 = Math.max(prev2 + num, prev1);\n\t\tprev2 = temp;\n\t}\n\treturn prev1;\n}",
+      "source": "House Robber (DP Space Optimized)",
+      "id": 63,
+      "length": 247
+    },
+    {
+      "text": "public boolean canJump(int[] nums) {\n\tint maxReach = 0;\n\tfor (int i = 0; i < nums.length; i++) {\n\t\tif (i > maxReach) return false;\n\t\tmaxReach = Math.max(maxReach, i + nums[i]);\n\t\tif (maxReach >= nums.length - 1) return true;\n\t}\n\treturn true;\n}",
+      "source": "Jump Game (Greedy)",
+      "id": 64,
+      "length": 243
+    },
+    {
+      "text": "public int[] productExceptSelf(int[] nums) {\n\tint n = nums.length;\n\tint[] result = new int[n];\n\tresult[0] = 1;\n\tfor (int i = 1; i < n; i++) {\n\t\tresult[i] = result[i-1] * nums[i-1];\n\t}\n\tint right = 1;\n\tfor (int i = n-1; i >= 0; i--) {\n\t\tresult[i] *= right;\n\t\tright *= nums[i];\n\t}\n\treturn result;\n}",
+      "source": "Product of Array Except Self",
+      "id": 65,
+      "length": 296
+    },
+    {
+      "text": "public void rotate(int[] nums, int k) {\n\tk %= nums.length;\n\treverse(nums, 0, nums.length - 1);\n\treverse(nums, 0, k - 1);\n\treverse(nums, k, nums.length - 1);\n}\nprivate void reverse(int[] nums, int start, int end) {\n\twhile (start < end) {\n\t\tint temp = nums[start];\n\t\tnums[start++] = nums[end];\n\t\tnums[end--] = temp;\n\t}\n}",
+      "source": "Rotate Array",
+      "id": 66,
+      "length": 318
+    },
+    {
+      "text": "public String longestPalindrome(String s) {\n\tif (s.length() < 2) return s;\n\tint start = 0, maxLen = 0;\n\tfor (int i = 0; i < s.length(); i++) {\n\t\tint len1 = expandAroundCenter(s, i, i);\n\t\tint len2 = expandAroundCenter(s, i, i + 1);\n\t\tint len = Math.max(len1, len2);\n\t\tif (len > maxLen) {\n\t\t\tstart = i - (len - 1) / 2;\n\t\t\tmaxLen = len;\n\t\t}\n\t}\n\treturn s.substring(start, start + maxLen);\n}\nprivate int expandAroundCenter(String s, int left, int right) {\n\twhile (left >= 0 && right < s.length() && s.charAt(left) == s.charAt(right)) {\n\t\tleft--;\n\t\tright++;\n\t}\n\treturn right - left - 1;\n}",
+      "source": "Longest Palindromic Substring",
+      "id": 67,
+      "length": 582
+    },
+    {
+      "text": "public int lengthOfLongestSubstring(String s) {\n\tMap<Character, Integer> map = new HashMap<>();\n\tint maxLen = 0, start = 0;\n\tfor (int end = 0; end < s.length(); end++) {\n\t\tchar c = s.charAt(end);\n\t\tif (map.containsKey(c)) {\n\t\t\tstart = Math.max(start, map.get(c) + 1);\n\t\t}\n\t\tmap.put(c, end);\n\t\tmaxLen = Math.max(maxLen, end - start + 1);\n\t}\n\treturn maxLen;\n}",
+      "source": "Longest Substring Without Repeating Characters",
+      "id": 68,
+      "length": 357
+    },
+    {
+      "text": "public int trap(int[] height) {\n\tint left = 0, right = height.length - 1;\n\tint leftMax = 0, rightMax = 0, water = 0;\n\twhile (left < right) {\n\t\tif (height[left] < height[right]) {\n\t\t\tif (height[left] >= leftMax) leftMax = height[left];\n\t\t\telse water += leftMax - height[left];\n\t\t\tleft++;\n\t\t} else {\n\t\t\tif (height[right] >= rightMax) rightMax = height[right];\n\t\t\telse water += rightMax - height[right];\n\t\t\tright--;\n\t\t}\n\t}\n\treturn water;\n}",
+      "source": "Trapping Rain Water (Two Pointers)",
+      "id": 69,
+      "length": 436
+    },
+    {
+      "text": "public List<List<Integer>> threeSum(int[] nums) {\n\tList<List<Integer>> result = new ArrayList<>();\n\tArrays.sort(nums);\n\tfor (int i = 0; i < nums.length - 2; i++) {\n\t\tif (i > 0 && nums[i] == nums[i-1]) continue;\n\t\tint left = i + 1, right = nums.length - 1;\n\t\twhile (left < right) {\n\t\t\tint sum = nums[i] + nums[left] + nums[right];\n\t\t\tif (sum == 0) {\n\t\t\t\tresult.add(Arrays.asList(nums[i], nums[left], nums[right]));\n\t\t\t\twhile (left < right && nums[left] == nums[left+1]) left++;\n\t\t\t\twhile (left < right && nums[right] == nums[right-1]) right--;\n\t\t\t\tleft++; right--;\n\t\t\t} else if (sum < 0) left++;\n\t\t\telse right--;\n\t\t}\n\t}\n\treturn result;\n}",
+      "source": "3Sum Problem",
+      "id": 70,
+      "length": 636
+    },
+    {
+      "text": "public int[][] merge(int[][] intervals) {\n\tif (intervals.length <= 1) return intervals;\n\tArrays.sort(intervals, (a, b) -> a[0] - b[0]);\n\tList<int[]> result = new ArrayList<>();\n\tint[] curr = intervals[0];\n\tfor (int i = 1; i < intervals.length; i++) {\n\t\tif (intervals[i][0] <= curr[1]) {\n\t\t\tcurr[1] = Math.max(curr[1], intervals[i][1]);\n\t\t} else {\n\t\t\tresult.add(curr);\n\t\t\tcurr = intervals[i];\n\t\t}\n\t}\n\tresult.add(curr);\n\treturn result.toArray(new int[result.size()][]);\n}",
+      "source": "Merge Intervals",
+      "id": 71,
+      "length": 469
+    },
+    {
+      "text": "public List<List<String>> groupAnagrams(String[] strs) {\n\tMap<String, List<String>> map = new HashMap<>();\n\tfor (String str : strs) {\n\t\tchar[] chars = str.toCharArray();\n\t\tArrays.sort(chars);\n\t\tString key = new String(chars);\n\t\tmap.computeIfAbsent(key, k -> new ArrayList<>()).add(str);\n\t}\n\treturn new ArrayList<>(map.values());\n}",
+      "source": "Group Anagrams",
+      "id": 72,
+      "length": 330
+    },
+    {
+      "text": "public int findKthLargest(int[] nums, int k) {\n\tPriorityQueue<Integer> pq = new PriorityQueue<>();\n\tfor (int num : nums) {\n\t\tpq.offer(num);\n\t\tif (pq.size() > k) pq.poll();\n\t}\n\treturn pq.peek();\n}",
+      "source": "Kth Largest Element in Array (Min Heap)",
+      "id": 73,
+      "length": 195
+    },
+    {
+      "text": "public int[] topKFrequent(int[] nums, int k) {\n\tMap<Integer, Integer> map = new HashMap<>();\n\tfor (int num : nums) map.put(num, map.getOrDefault(num, 0) + 1);\n\tPriorityQueue<Integer> pq = new PriorityQueue<>((a, b) -> map.get(a) - map.get(b));\n\tfor (int key : map.keySet()) {\n\t\tpq.offer(key);\n\t\tif (pq.size() > k) pq.poll();\n\t}\n\tint[] result = new int[k];\n\tfor (int i = 0; i < k; i++) result[i] = pq.poll();\n\treturn result;\n}",
+      "source": "Top K Frequent Elements",
+      "id": 74,
+      "length": 425
+    },
+    {
+      "text": "class TrieNode {\n\tTrieNode[] children = new TrieNode[26];\n\tboolean isEnd = false;\n}\npublic void insert(String word) {\n\tTrieNode node = root;\n\tfor (char c : word.toCharArray()) {\n\t\tif (node.children[c - 'a'] == null) {\n\t\t\tnode.children[c - 'a'] = new TrieNode();\n\t\t}\n\t\tnode = node.children[c - 'a'];\n\t}\n\tnode.isEnd = true;\n}",
+      "source": "Trie (Prefix Tree) Insert",
+      "id": 75,
+      "length": 323
+    },
+    {
+      "text": "class UnionFind {\n\tint[] parent, rank;\n\tpublic UnionFind(int n) {\n\t\tparent = new int[n];\n\t\trank = new int[n];\n\t\tfor (int i = 0; i < n; i++) parent[i] = i;\n\t}\n\tpublic int find(int x) {\n\t\tif (parent[x] != x) parent[x] = find(parent[x]);\n\t\treturn parent[x];\n\t}\n\tpublic void union(int x, int y) {\n\t\tint px = find(x), py = find(y);\n\t\tif (px == py) return;\n\t\tif (rank[px] < rank[py]) parent[px] = py;\n\t\telse if (rank[px] > rank[py]) parent[py] = px;\n\t\telse { parent[py] = px; rank[px]++; }\n\t}\n}",
+      "source": "Union Find (Disjoint Set Union)",
+      "id": 76,
+      "length": 488
+    },
+    {
+      "text": "public void backtrack(List<List<Integer>> result, List<Integer> temp, int[] nums, int start) {\n\tresult.add(new ArrayList<>(temp));\n\tfor (int i = start; i < nums.length; i++) {\n\t\ttemp.add(nums[i]);\n\t\tbacktrack(result, temp, nums, i + 1);\n\t\ttemp.remove(temp.size() - 1);\n\t}\n}",
+      "source": "Backtracking Template (Subsets)",
+      "id": 77,
+      "length": 273
+    },
+    {
+      "text": "public List<List<Integer>> permute(int[] nums) {\n\tList<List<Integer>> result = new ArrayList<>();\n\tbacktrack(result, new ArrayList<>(), nums, new boolean[nums.length]);\n\treturn result;\n}\nprivate void backtrack(List<List<Integer>> result, List<Integer> temp, int[] nums, boolean[] used) {\n\tif (temp.size() == nums.length) {\n\t\tresult.add(new ArrayList<>(temp));\n\t\treturn;\n\t}\n\tfor (int i = 0; i < nums.length; i++) {\n\t\tif (used[i]) continue;\n\t\tused[i] = true;\n\t\ttemp.add(nums[i]);\n\t\tbacktrack(result, temp, nums, used);\n\t\ttemp.remove(temp.size() - 1);\n\t\tused[i] = false;\n\t}\n}",
+      "source": "Permutations (Backtracking)",
+      "id": 78,
+      "length": 572
+    },
+    {
+      "text": "public boolean exist(char[][] board, String word) {\n\tfor (int i = 0; i < board.length; i++) {\n\t\tfor (int j = 0; j < board[0].length; j++) {\n\t\t\tif (dfs(board, word, i, j, 0)) return true;\n\t\t}\n\t}\n\treturn false;\n}\nprivate boolean dfs(char[][] board, String word, int i, int j, int idx) {\n\tif (idx == word.length()) return true;\n\tif (i < 0 || i >= board.length || j < 0 || j >= board[0].length || board[i][j] != word.charAt(idx)) return false;\n\tchar temp = board[i][j];\n\tboard[i][j] = '#';\n\tboolean found = dfs(board, word, i+1, j, idx+1) || dfs(board, word, i-1, j, idx+1) || dfs(board, word, i, j+1, idx+1) || dfs(board, word, i, j-1, idx+1);\n\tboard[i][j] = temp;\n\treturn found;\n}",
+      "source": "Word Search (Backtracking on Grid)",
+      "id": 79,
+      "length": 678
+    },
+    {
+      "text": "public int minWindow(String s, String t) {\n\tMap<Character, Integer> map = new HashMap<>();\n\tfor (char c : t.toCharArray()) map.put(c, map.getOrDefault(c, 0) + 1);\n\tint left = 0, minLen = Integer.MAX_VALUE, minStart = 0, count = t.length();\n\tfor (int right = 0; right < s.length(); right++) {\n\t\tchar c = s.charAt(right);\n\t\tif (map.containsKey(c)) {\n\t\t\tif (map.get(c) > 0) count--;\n\t\t\tmap.put(c, map.get(c) - 1);\n\t\t}\n\t\twhile (count == 0) {\n\t\t\tif (right - left + 1 < minLen) {\n\t\t\t\tminLen = right - left + 1;\n\t\t\t\tminStart = left;\n\t\t\t}\n\t\t\tchar leftChar = s.charAt(left);\n\t\t\tif (map.containsKey(leftChar)) {\n\t\t\t\tmap.put(leftChar, map.get(leftChar) + 1);\n\t\t\t\tif (map.get(leftChar) > 0) count++;\n\t\t\t}\n\t\t\tleft++;\n\t\t}\n\t}\n\treturn minLen == Integer.MAX_VALUE ? \"\" : s.substring(minStart, minStart + minLen);\n}",
+      "source": "Minimum Window Substring (Sliding Window)",
+      "id": 80,
+      "length": 797
+    },
+    {
+      "text": "public int maxProfit(int[] prices) {\n\tint minPrice = Integer.MAX_VALUE;\n\tint maxProfit = 0;\n\tfor (int price : prices) {\n\t\tif (price < minPrice) minPrice = price;\n\t\telse maxProfit = Math.max(maxProfit, price - minPrice);\n\t}\n\treturn maxProfit;\n}",
+      "source": "Best Time to Buy and Sell Stock",
+      "id": 81,
+      "length": 243
+    },
+    {
+      "text": "public boolean isValidBST(TreeNode root) {\n\treturn validate(root, null, null);\n}\nprivate boolean validate(TreeNode node, Integer min, Integer max) {\n\tif (node == null) return true;\n\tif ((min != null && node.val <= min) || (max != null && node.val >= max)) return false;\n\treturn validate(node.left, min, node.val) && validate(node.right, node.val, max);\n}",
+      "source": "Validate Binary Search Tree",
+      "id": 82,
+      "length": 354
+    },
+    {
+      "text": "CompletableFuture<String> future = CompletableFuture.supplyAsync(() -> {\n\treturn fetchData();\n}).thenApply(data -> processData(data))\n  .thenAccept(result -> System.out.println(result))\n  .exceptionally(ex -> { ex.printStackTrace(); return null; });",
+      "source": "CompletableFuture Async Processing",
+      "id": 83,
+      "length": 249
+    },
+    {
+      "text": "ExecutorService executor = Executors.newFixedThreadPool(10);\nList<Future<String>> futures = new ArrayList<>();\nfor (Task task : tasks) {\n\tfutures.add(executor.submit(() -> task.execute()));\n}\nfor (Future<String> future : futures) {\n\tString result = future.get();\n}\nexecutor.shutdown();",
+      "source": "Thread Pool and Future Management",
+      "id": 84,
+      "length": 285
+    },
+    {
+      "text": "private final ReentrantLock lock = new ReentrantLock();\npublic void threadSafeMethod() {\n\tlock.lock();\n\ttry {\n\t\t// critical section\n\t} finally {\n\t\tlock.unlock();\n\t}\n}",
+      "source": "ReentrantLock Thread Safety",
+      "id": 85,
+      "length": 166
+    },
+    {
+      "text": "private final AtomicInteger counter = new AtomicInteger(0);\npublic void increment() {\n\tcounter.incrementAndGet();\n}\npublic int get() {\n\treturn counter.get();\n}",
+      "source": "Atomic Variables for Lock-Free Operations",
+      "id": 86,
+      "length": 159
+    },
+    {
+      "text": "CountDownLatch latch = new CountDownLatch(3);\nfor (int i = 0; i < 3; i++) {\n\tnew Thread(() -> {\n\t\tdoWork();\n\t\tlatch.countDown();\n\t}).start();\n}\nlatch.await();",
+      "source": "CountDownLatch for Thread Coordination",
+      "id": 87,
+      "length": 158
+    },
+    {
+      "text": "ConcurrentHashMap<String, Integer> map = new ConcurrentHashMap<>();\nmap.put(\"key\", 1);\nmap.computeIfAbsent(\"key\", k -> expensiveComputation(k));\nmap.merge(\"key\", 1, Integer::sum);",
+      "source": "ConcurrentHashMap Thread-Safe Operations",
+      "id": 88,
+      "length": 179
+    },
+    {
+      "text": "List<String> result = list.parallelStream()\n\t.filter(s -> s.length() > 5)\n\t.map(String::toUpperCase)\n\t.collect(Collectors.toList());",
+      "source": "Parallel Streams for Performance",
+      "id": 89,
+      "length": 132
+    },
+    {
+      "text": "Optional<String> optional = Optional.ofNullable(value);\nString result = optional\n\t.filter(s -> s.length() > 0)\n\t.map(String::toUpperCase)\n\t.orElse(\"DEFAULT\");\noptional.ifPresent(System.out::println);",
+      "source": "Optional API for Null Safety",
+      "id": 90,
+      "length": 199
+    },
+    {
+      "text": "Map<String, List<Person>> grouped = people.stream()\n\t.collect(Collectors.groupingBy(Person::getCity));\nMap<String, Long> counted = people.stream()\n\t.collect(Collectors.groupingBy(Person::getCity, Collectors.counting()));",
+      "source": "Advanced Collectors - GroupingBy",
+      "id": 91,
+      "length": 220
+    },
+    {
+      "text": "String joined = list.stream()\n\t.collect(Collectors.joining(\", \", \"[\", \"]\"));\nMap<Boolean, List<Integer>> partitioned = numbers.stream()\n\t.collect(Collectors.partitioningBy(n -> n % 2 == 0));",
+      "source": "Collectors - Joining and Partitioning",
+      "id": 92,
+      "length": 190
+    },
+    {
+      "text": "public class Singleton {\n\tprivate static volatile Singleton instance;\n\tprivate Singleton() {}\n\tpublic static Singleton getInstance() {\n\t\tif (instance == null) {\n\t\t\tsynchronized (Singleton.class) {\n\t\t\t\tif (instance == null) {\n\t\t\t\t\tinstance = new Singleton();\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\treturn instance;\n\t}\n}",
+      "source": "Thread-Safe Singleton (Double-Checked Locking)",
+      "id": 93,
+      "length": 296
+    },
+    {
+      "text": "public enum Singleton {\n\tINSTANCE;\n\tprivate Connection connection;\n\tprivate Singleton() {\n\t\tconnection = createConnection();\n\t}\n\tpublic Connection getConnection() {\n\t\treturn connection;\n\t}\n}",
+      "source": "Enum Singleton Pattern (Best Practice)",
+      "id": 94,
+      "length": 190
+    },
+    {
+      "text": "public interface Builder<T> {\n\tT build();\n}\npublic class Person {\n\tprivate final String name;\n\tprivate final int age;\n\tprivate Person(Builder builder) {\n\t\tthis.name = builder.name;\n\t\tthis.age = builder.age;\n\t}\n\tpublic static class Builder {\n\t\tprivate String name;\n\t\tprivate int age;\n\t\tpublic Builder name(String name) { this.name = name; return this; }\n\t\tpublic Builder age(int age) { this.age = age; return this; }\n\t\tpublic Person build() { return new Person(this); }\n\t}\n}",
+      "source": "Builder Pattern for Complex Objects",
+      "id": 95,
+      "length": 473
+    },
+    {
+      "text": "public interface Strategy {\n\tvoid execute();\n}\npublic class Context {\n\tprivate Strategy strategy;\n\tpublic void setStrategy(Strategy strategy) {\n\t\tthis.strategy = strategy;\n\t}\n\tpublic void executeStrategy() {\n\t\tstrategy.execute();\n\t}\n}",
+      "source": "Strategy Pattern",
+      "id": 96,
+      "length": 234
+    },
+    {
+      "text": "public interface Observer {\n\tvoid update(String message);\n}\npublic class Subject {\n\tprivate List<Observer> observers = new ArrayList<>();\n\tpublic void attach(Observer observer) { observers.add(observer); }\n\tpublic void notifyObservers(String message) {\n\t\tobservers.forEach(o -> o.update(message));\n\t}\n}",
+      "source": "Observer Pattern",
+      "id": 97,
+      "length": 302
+    },
+    {
+      "text": "public class CacheProxy implements Service {\n\tprivate Service realService;\n\tprivate Map<String, String> cache = new HashMap<>();\n\tpublic String getData(String key) {\n\t\treturn cache.computeIfAbsent(key, k -> realService.getData(k));\n\t}\n}",
+      "source": "Proxy Pattern with Caching",
+      "id": 98,
+      "length": 236
+    },
+    {
+      "text": "Function<Integer, Integer> multiply = x -> x * 2;\nFunction<Integer, Integer> add = x -> x + 3;\nFunction<Integer, Integer> composed = multiply.andThen(add);\nint result = composed.apply(5);",
+      "source": "Function Composition",
+      "id": 99,
+      "length": 187
+    },
+    {
+      "text": "Predicate<String> notNull = Objects::nonNull;\nPredicate<String> notEmpty = s -> !s.isEmpty();\nPredicate<String> valid = notNull.and(notEmpty);\nlist.stream().filter(valid).collect(Collectors.toList());",
+      "source": "Predicate Chaining",
+      "id": 100,
+      "length": 200
+    },
+    {
+      "text": "Supplier<String> lazyValue = () -> expensiveComputation();\nConsumer<String> printer = System.out::println;\nBiFunction<Integer, Integer, Integer> adder = (a, b) -> a + b;",
+      "source": "Functional Interfaces - Supplier, Consumer, BiFunction",
+      "id": 101,
+      "length": 169
+    },
+    {
+      "text": "public <T> T retry(Supplier<T> operation, int maxRetries) {\n\tint attempts = 0;\n\twhile (attempts < maxRetries) {\n\t\ttry {\n\t\t\treturn operation.get();\n\t\t} catch (Exception e) {\n\t\t\tattempts++;\n\t\t\tif (attempts >= maxRetries) throw e;\n\t\t}\n\t}\n\tthrow new RuntimeException(\"Max retries exceeded\");\n}",
+      "source": "Retry Logic Pattern",
+      "id": 102,
+      "length": 289
+    },
+    {
+      "text": "public class CircuitBreaker {\n\tprivate int failureCount = 0;\n\tprivate final int threshold = 5;\n\tprivate boolean open = false;\n\tpublic <T> T execute(Supplier<T> operation) {\n\t\tif (open) throw new RuntimeException(\"Circuit open\");\n\t\ttry {\n\t\t\tT result = operation.get();\n\t\t\tfailureCount = 0;\n\t\t\treturn result;\n\t\t} catch (Exception e) {\n\t\t\tif (++failureCount >= threshold) open = true;\n\t\t\tthrow e;\n\t\t}\n\t}\n}",
+      "source": "Circuit Breaker Pattern",
+      "id": 103,
+      "length": 402
+    },
+    {
+      "text": "try (Connection conn = dataSource.getConnection();\n     PreparedStatement stmt = conn.prepareStatement(\"SELECT * FROM users WHERE id = ?\")) {\n\tstmt.setInt(1, userId);\n\tResultSet rs = stmt.executeQuery();\n\twhile (rs.next()) {\n\t\tSystem.out.println(rs.getString(\"name\"));\n\t}\n} catch (SQLException e) {\n\te.printStackTrace();\n}",
+      "source": "JDBC Best Practices with Try-With-Resources",
+      "id": 104,
+      "length": 322
+    },
+    {
+      "text": "@Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.READ_COMMITTED)\npublic void updateAccount(Account account) {\n\taccountRepository.save(account);\n\tauditLog.log(\"Account updated\");\n}",
+      "source": "Spring Transaction Management",
+      "id": 105,
+      "length": 203
+    },
+    {
+      "text": "@Cacheable(value = \"users\", key = \"#id\")\npublic User getUserById(Long id) {\n\treturn userRepository.findById(id).orElse(null);\n}\n@CacheEvict(value = \"users\", key = \"#user.id\")\npublic void updateUser(User user) {\n\tuserRepository.save(user);\n}",
+      "source": "Spring Cache Annotations",
+      "id": 106,
+      "length": 240
+    },
+    {
+      "text": "@Async\npublic CompletableFuture<String> processAsync() {\n\treturn CompletableFuture.completedFuture(performTask());\n}\n@Scheduled(fixedRate = 5000)\npublic void scheduledTask() {\n\tSystem.out.println(\"Running scheduled task\");\n}",
+      "source": "Spring Async and Scheduled Tasks",
+      "id": 107,
+      "length": 224
+    },
+    {
+      "text": "public class CustomException extends RuntimeException {\n\tprivate final String errorCode;\n\tpublic CustomException(String message, String errorCode) {\n\t\tsuper(message);\n\t\tthis.errorCode = errorCode;\n\t}\n\tpublic String getErrorCode() { return errorCode; }\n}",
+      "source": "Custom Exception with Error Codes",
+      "id": 108,
+      "length": 253
+    },
+    {
+      "text": "public Result<T> operation() {\n\ttry {\n\t\tT data = riskyOperation();\n\t\treturn Result.success(data);\n\t} catch (Exception e) {\n\t\treturn Result.failure(e.getMessage());\n\t}\n}",
+      "source": "Result Type Pattern (Avoid Exception for Control Flow)",
+      "id": 109,
+      "length": 168
+    },
+    {
+      "text": "private static final Logger logger = LoggerFactory.getLogger(MyClass.class);\npublic void process() {\n\tlogger.info(\"Processing started\");\n\tlogger.debug(\"Debug info: {}\", data);\n\tlogger.error(\"Error occurred\", exception);\n}",
+      "source": "SLF4J Logging Best Practices",
+      "id": 110,
+      "length": 221
+    },
+    {
+      "text": "Instant now = Instant.now();\nZonedDateTime zdt = ZonedDateTime.now(ZoneId.of(\"UTC\"));\nDuration duration = Duration.between(start, end);\nPeriod period = Period.between(startDate, endDate);\nboolean isBefore = date1.isBefore(date2);",
+      "source": "Java Time API - Instant, Duration, Period",
+      "id": 111,
+      "length": 229
+    },
+    {
+      "text": "DateTimeFormatter formatter = DateTimeFormatter.ofPattern(\"yyyy-MM-dd HH:mm:ss\");\nString formatted = LocalDateTime.now().format(formatter);\nLocalDateTime parsed = LocalDateTime.parse(\"2024-01-01 12:00:00\", formatter);",
+      "source": "DateTimeFormatter Parsing and Formatting",
+      "id": 112,
+      "length": 217
+    },
+    {
+      "text": "public <T> List<T> toList(T... elements) {\n\treturn Arrays.asList(elements);\n}\npublic <K, V> Map<K, V> createMap(K key, V value) {\n\tMap<K, V> map = new HashMap<>();\n\tmap.put(key, value);\n\treturn map;\n}",
+      "source": "Generic Methods with Type Parameters",
+      "id": 113,
+      "length": 200
+    },
+    {
+      "text": "public class Box<T extends Comparable<T>> {\n\tprivate T value;\n\tpublic T max(T other) {\n\t\treturn value.compareTo(other) > 0 ? value : other;\n\t}\n}",
+      "source": "Bounded Type Parameters",
+      "id": 114,
+      "length": 144
+    },
+    {
+      "text": "List<? extends Number> numbers = new ArrayList<Integer>();\nvoid process(List<? super Integer> list) {\n\tlist.add(42);\n}",
+      "source": "Wildcards - Extends and Super (PECS)",
+      "id": 115,
+      "length": 118
+    },
+    {
+      "text": "var list = List.of(1, 2, 3);\nvar map = Map.of(\"key\", \"value\");\nvar stream = list.stream().filter(x -> x > 1);",
+      "source": "Local Variable Type Inference (var)",
+      "id": 116,
+      "length": 109
+    },
+    {
+      "text": "switch (day) {\n\tcase MONDAY, FRIDAY, SUNDAY -> System.out.println(\"6\");\n\tcase TUESDAY -> System.out.println(\"7\");\n\tdefault -> System.out.println(\"8\");\n}\nint numLetters = switch (day) {\n\tcase MONDAY -> 6;\n\tcase TUESDAY -> 7;\n\tdefault -> 8;\n};",
+      "source": "Switch Expressions (Java 12+)",
+      "id": 117,
+      "length": 241
+    },
+    {
+      "text": "if (obj instanceof String s) {\n\tSystem.out.println(s.toUpperCase());\n}\nif (obj instanceof Integer i && i > 0) {\n\tSystem.out.println(\"Positive: \" + i);\n}",
+      "source": "Pattern Matching for instanceof (Java 14+)",
+      "id": 118,
+      "length": 152
+    },
+    {
+      "text": "record Person(String name, int age) {\n\tpublic Person {\n\t\tif (age < 0) throw new IllegalArgumentException();\n\t}\n\tpublic boolean isAdult() {\n\t\treturn age >= 18;\n\t}\n}",
+      "source": "Records for Immutable Data (Java 14+)",
+      "id": 119,
+      "length": 163
+    },
+    {
+      "text": "sealed interface Shape permits Circle, Rectangle, Triangle {}\nfinal class Circle implements Shape {}\nfinal class Rectangle implements Shape {}\nfinal class Triangle implements Shape {}",
+      "source": "Sealed Classes (Java 17+)",
+      "id": 120,
+      "length": 183
+    },
+    {
+      "text": "String result = switch (shape) {\n\tcase Circle c -> \"Circle with radius \" + c.radius();\n\tcase Rectangle r -> \"Rectangle \" + r.width() + \"x\" + r.height();\n\tcase Triangle t -> \"Triangle\";\n};",
+      "source": "Pattern Matching with Sealed Classes",
+      "id": 121,
+      "length": 187
+    },
+    {
+      "text": "WeakHashMap<Key, Value> cache = new WeakHashMap<>();\nWeakReference<Object> weakRef = new WeakReference<>(object);\nSoftReference<Object> softRef = new SoftReference<>(object);",
+      "source": "Weak and Soft References for Memory Management",
+      "id": 122,
+      "length": 174
+    },
+    {
+      "text": "Runtime runtime = Runtime.getRuntime();\nlong totalMemory = runtime.totalMemory();\nlong freeMemory = runtime.freeMemory();\nlong maxMemory = runtime.maxMemory();\nruntime.gc();",
+      "source": "JVM Memory Management",
+      "id": 123,
+      "length": 173
+    },
+    {
+      "text": "Class<?> clazz = Class.forName(\"com.example.MyClass\");\nObject instance = clazz.getDeclaredConstructor().newInstance();\nMethod method = clazz.getMethod(\"methodName\", String.class);\nObject result = method.invoke(instance, \"parameter\");",
+      "source": "Reflection API Basics",
+      "id": 124,
+      "length": 233
+    },
+    {
+      "text": "@Retention(RetentionPolicy.RUNTIME)\n@Target(ElementType.METHOD)\npublic @interface Timed {\n\tString value() default \"\";\n}\npublic void processAnnotations(Method method) {\n\tif (method.isAnnotationPresent(Timed.class)) {\n\t\tTimed timed = method.getAnnotation(Timed.class);\n\t}\n}",
+      "source": "Custom Annotations and Processing",
+      "id": 125,
+      "length": 271
+    },
+    {
+      "text": "public interface Repository<T, ID> {\n\tOptional<T> findById(ID id);\n\tList<T> findAll();\n\tT save(T entity);\n\tvoid deleteById(ID id);\n\tdefault boolean existsById(ID id) {\n\t\treturn findById(id).isPresent();\n\t}\n}",
+      "source": "Generic Repository Pattern",
+      "id": 126,
+      "length": 207
+    },
+    {
+      "text": "public class ThreadLocalContext {\n\tprivate static final ThreadLocal<User> currentUser = ThreadLocal.withInitial(() -> null);\n\tpublic static void setUser(User user) { currentUser.set(user); }\n\tpublic static User getUser() { return currentUser.get(); }\n\tpublic static void clear() { currentUser.remove(); }\n}",
+      "source": "ThreadLocal for Context Management",
+      "id": 127,
+      "length": 306
+    },
+    {
+      "text": "Semaphore semaphore = new Semaphore(3);\npublic void limitedAccess() throws InterruptedException {\n\tsemaphore.acquire();\n\ttry {\n\t\t// limited access section\n\t} finally {\n\t\tsemaphore.release();\n\t}\n}",
+      "source": "Semaphore for Resource Limiting",
+      "id": 128,
+      "length": 195
+    },
+    {
+      "text": "CyclicBarrier barrier = new CyclicBarrier(3, () -> System.out.println(\"All threads reached barrier\"));\npublic void workerThread() throws Exception {\n\tdoWork();\n\tbarrier.await();\n\tdoMoreWork();\n}",
+      "source": "CyclicBarrier for Thread Synchronization",
+      "id": 129,
+      "length": 194
+    },
+    {
+      "text": "Phaser phaser = new Phaser(1);\nphaser.register();\nfor (int i = 0; i < 3; i++) {\n\tnew Thread(() -> {\n\t\tphaser.arriveAndAwaitAdvance();\n\t\tdoPhaseWork();\n\t}).start();\n}\nphaser.arriveAndDeregister();",
+      "source": "Phaser for Multi-Phase Concurrent Operations",
+      "id": 130,
+      "length": 195
+    },
+    {
+      "text": "BlockingQueue<Task> queue = new LinkedBlockingQueue<>(100);\npublic void producer() throws InterruptedException {\n\tqueue.put(new Task());\n}\npublic Task consumer() throws InterruptedException {\n\treturn queue.take();\n}",
+      "source": "BlockingQueue for Producer-Consumer Pattern",
+      "id": 131,
+      "length": 215
+    },
+    {
+      "text": "List<CompletableFuture<String>> futures = tasks.stream()\n\t.map(task -> CompletableFuture.supplyAsync(() -> task.execute()))\n\t.collect(Collectors.toList());\nCompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();\nList<String> results = futures.stream().map(CompletableFuture::join).collect(Collectors.toList());",
+      "source": "Parallel Task Execution with CompletableFuture",
+      "id": 132,
+      "length": 329
+    },
+    {
+      "text": "ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);\nscheduler.schedule(() -> doTask(), 5, TimeUnit.SECONDS);\nscheduler.scheduleAtFixedRate(() -> doTask(), 0, 1, TimeUnit.MINUTES);\nscheduler.scheduleWithFixedDelay(() -> doTask(), 0, 1, TimeUnit.MINUTES);",
+      "source": "ScheduledExecutorService for Delayed/Periodic Tasks",
+      "id": 133,
+      "length": 275
+    },
+    {
+      "text": "ForkJoinPool pool = new ForkJoinPool();\nRecursiveTask<Long> task = new SumTask(array, 0, array.length);\nLong result = pool.invoke(task);\nclass SumTask extends RecursiveTask<Long> {\n\tprotected Long compute() {\n\t\tif (high - low <= THRESHOLD) return computeDirectly();\n\t\tSumTask left = new SumTask(array, low, mid);\n\t\tleft.fork();\n\t\treturn right.compute() + left.join();\n\t}\n}",
+      "source": "ForkJoinPool for Divide-and-Conquer Algorithms",
+      "id": 134,
+      "length": 372
+    },
+    {
+      "text": "public static <T> Collector<T, ?, List<T>> toImmutableList() {\n\treturn Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList);\n}\nList<String> immutable = stream.collect(toImmutableList());",
+      "source": "Custom Collector Implementation",
+      "id": 135,
+      "length": 214
+    },
+    {
+      "text": "Stream.iterate(0, n -> n + 1)\n\t.limit(10)\n\t.forEach(System.out::println);\nStream.generate(Math::random)\n\t.limit(5)\n\t.forEach(System.out::println);",
+      "source": "Infinite Streams with iterate() and generate()",
+      "id": 136,
+      "length": 146
+    },
+    {
+      "text": "IntStream.range(0, 10).forEach(System.out::println);\nOptionalInt max = IntStream.of(1, 2, 3, 4, 5).max();\nint sum = IntStream.rangeClosed(1, 100).sum();\ndouble avg = DoubleStream.of(1.0, 2.0, 3.0).average().orElse(0.0);",
+      "source": "Primitive Streams - IntStream, LongStream, DoubleStream",
+      "id": 137,
+      "length": 219
+    },
+    {
+      "text": "public class LazyLoader<T> {\n\tprivate volatile T instance;\n\tprivate final Supplier<T> supplier;\n\tpublic LazyLoader(Supplier<T> supplier) { this.supplier = supplier; }\n\tpublic T get() {\n\t\tif (instance == null) {\n\t\t\tsynchronized(this) {\n\t\t\t\tif (instance == null) instance = supplier.get();\n\t\t\t}\n\t\t}\n\t\treturn instance;\n\t}\n}",
+      "source": "Lazy Initialization Pattern",
+      "id": 138,
+      "length": 320
+    },
+    {
+      "text": "public <T> T measurePerformance(Supplier<T> operation, String operationName) {\n\tlong start = System.nanoTime();\n\tT result = operation.get();\n\tlong duration = System.nanoTime() - start;\n\tlogger.info(\"{} took {} ms\", operationName, duration / 1_000_000);\n\treturn result;\n}",
+      "source": "Performance Measurement Wrapper",
+      "id": 139,
+      "length": 270
+    },
+    {
+      "text": "public String processWithMetrics(String input) {\n\tTimer.Sample sample = Timer.start(meterRegistry);\n\ttry {\n\t\tString result = process(input);\n\t\tcounter.increment();\n\t\treturn result;\n\t} finally {\n\t\tsample.stop(timer);\n\t}\n}",
+      "source": "Micrometer Metrics Integration",
+      "id": 140,
+      "length": 220
     }
   ]
 }
diff --git a/frontend/static/quotes/code_jule.json b/frontend/static/quotes/code_jule.json
index 589a35441b01..9a43b858f3d0 100644
--- a/frontend/static/quotes/code_jule.json
+++ b/frontend/static/quotes/code_jule.json
@@ -110,9 +110,9 @@
       "id": 17
     },
     {
-      "text": "struct Dog {\n\tname: str\n\twords: str = \"woof woof\"\n}\n\nimpl Dog {\n    static fn spawn(name: str): Dog {\n\t\tret Dog { name: name }\n    }\n\n\tfn voice(self) {\n\t\tprintln(self.name + \" - \" + self.words)\n\t}\n}\n\nfn main() {\n\tdog0 := Dog.spawn(\"Rex\")\n\tdog1 := Dog.spawn(\"Buddy\")\n\n\tprintln(dog0.name)\n\n\tdog0.voice()\n\tdog1.voice()\n}",
+      "text": "struct Dog {\n\tname: str\n\twords: str = \"woof woof\"\n}\n\nimpl Dog {\n\tstatic fn spawn(name: str): Dog {\n\t\tret Dog { name: name }\n\t}\n\n\tfn voice(*self) {\n\t\tprintln(self.name + \" - \" + self.words)\n\t}\n}\n\nfn main() {\n\tdog0 := Dog.spawn(\"Rex\")\n\tdog1 := Dog.spawn(\"Buddy\")\n\n\tprintln(dog0.name)\n\n\tdog0.voice()\n\tdog1.voice()\n}",
       "source": "Common Concepts - Structures | manual.jule.dev",
-      "length": 317,
+      "length": 312,
       "id": 18
     },
     {
@@ -134,9 +134,9 @@
       "id": 21
     },
     {
-      "text": "type Int: int\n\nimpl Int {\n\tfn IsEven(self): bool { ret self%2 == 0 }\n\tfn IsOdd(self): bool { ret self%2 == 1 }\n}\n\nfn main() {\n\tx := Int(20)\n\tprintln(x.IsEven())\n\tprintln(x.IsOdd())\n}",
+      "text": "type Int: int\n\nimpl Int {\n\tfn IsEven(*self): bool { ret self%2 == 0 }\n\tfn IsOdd(*self): bool { ret self%2 == 1 }\n}\n\nfn main() {\n\tx := Int(20)\n\tprintln(x.IsEven())\n\tprintln(x.IsOdd())\n}",
       "source": "Types - Aliasing | manual.jule.dev",
-      "length": 182,
+      "length": 184,
       "id": 22
     },
     {
@@ -146,9 +146,9 @@
       "id": 23
     },
     {
-      "text": "trait Foo {\n    fn foo(self)\n}\n\ntrait Bar {\n    fn bar(self)\n}\n\ntrait FooBar {\n    Foo\n    Bar\n}\n\nstruct Baz {}\n\nimpl FooBar for Baz {\n    fn foo(self) { println(\"foo\") }\n    fn bar(self) { println(\"bar\") }\n}\n\nfn main() {\n    let a: FooBar = Baz{}\n    a.foo()\n    a.bar()\n    let b: Foo = a\n    b.foo()\n    let c: Bar = a\n    c.bar()\n}",
+      "text": "trait Foo {\n\tfn foo(*self)\n}\n\ntrait Bar {\n\tfn bar(*self)\n}\n\ntrait FooBar {\n\tFoo\n\tBar\n}\n\nstruct Baz {}\n\nimpl FooBar for Baz {\n\tfn foo(*self) { println(\"foo\") }\n\tfn bar(*self) { println(\"bar\") }\n}\n\nfn main() {\n\tlet a: FooBar = Baz{}\n\ta.foo()\n\ta.bar()\n\tlet b: Foo = a\n\tb.foo()\n\tlet c: Bar = a\n\tc.bar()\n}",
       "source": "Dynamic Types - Traits | manual.jule.dev",
-      "length": 335,
+      "length": 300,
       "id": 24
     },
     {
diff --git a/frontend/static/quotes/english.json b/frontend/static/quotes/english.json
index c30ad20ef602..c73fcd5f26cd 100644
--- a/frontend/static/quotes/english.json
+++ b/frontend/static/quotes/english.json
@@ -30612,7 +30612,7 @@
       "id": 5579
     },
     {
-      "text": "There is no elevator to success, you have to take the stairs.",
+      "text": "There is no elevator to success; you have to take the stairs.",
       "source": "Zig Ziglar",
       "length": 61,
       "id": 5580
@@ -39039,6 +39039,48 @@
       "source": "In Search of Lost Time",
       "id": 7719,
       "length": 1559
+    },
+    {
+      "text": "Love the world and yourself in it, move through it as though it offers no resistance, as though the world is your natural element.",
+      "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger",
+      "id": 7720,
+      "length": 130
+    },
+    {
+      "text": "Time is priceless, but it’s free. You can't own it, you can use it. You can spend it. But you can't keep it. Once you've lost it you can never get it back.",
+      "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger",
+      "id": 7721,
+      "length": 155
+    },
+    {
+      "text": "Don't you think it's better to be extremely happy for a short while, even if you lose it, than to be just okay for your whole life?",
+      "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger",
+      "id": 7722,
+      "length": 131
+    },
+    {
+      "text": "Home sweet home. No place like home. Take me home, country roads. Home is where the heart is. But my heart is here. So I must be home.",
+      "source": "The Time Traveler's Wife: Novel by Audrey Niffenegger",
+      "id": 7723,
+      "length": 134
+    },
+    {
+      "text": "Sure, but why not more poems about the sun? The sun is also a star, and it’s our most important one. That alone should be worth a poem or two.",
+      "source": "The Sun is Also a Star",
+      "id": 7724,
+      "length": 142
+    },
+    {
+      "text": "Y'know how everyone's saying, \"seize the moment?\". I don't know, I'm kinda thinking it's the other way around, you know? Like, the moment seizes us.",
+      "source": "Boyhood",
+      "id": 7725,
+      "length": 148
+    },
+    {
+      "text": "So let's run, make a great escape, and I'll be waiting outside for the getaway. It doesn't matter who we are, we’ll keep running through the dark. And all we'll ever need is another day, we can slow down, 'cause tomorrow is a mile away and live like shooting stars. You could wish away forever, but you'll never find a thing like today.",
+      "source": "End Credits",
+      "id": 7726,
+      "length": 336
     }
   ]
 }
diff --git a/frontend/static/quotes/hungarian.json b/frontend/static/quotes/hungarian.json
new file mode 100644
index 000000000000..c850d61d215f
--- /dev/null
+++ b/frontend/static/quotes/hungarian.json
@@ -0,0 +1,323 @@
+{
+  "language": "hungarian",
+  "groups": [
+    [0, 100],
+    [101, 300],
+    [301, 600],
+    [601, 9999]
+  ],
+  "quotes": [
+    {
+      "text": "Egy bizonyos szint fölött nem süllyedünk bizonyos szint alá.",
+      "source": "Esterházy Péter – Termelési-regény",
+      "id": 1,
+      "length": 60
+    },
+    {
+      "text": "Boldoggá az tehet, aki boldogtalanná is.Van, akit azért gyűlölsz, mert szeretni is tudnád.A biztos megöl, de túléled. A kétely éltet, de belehalsz.Az igazit elhagyjuk a többiért. A többit az igazi miatt.",
+      "source": "Márai Sándor – Aforizmák",
+      "id": 2,
+      "length": 203
+    },
+    {
+      "text": "Nem tudom, miért, meddig maradok meg még neked, de a kezedet fogom s őrizem a szemedet.",
+      "source": "Ady Endre – Őrizem a szemed",
+      "id": 3,
+      "length": 87
+    },
+    {
+      "text": "Aki kinyit tehát egy könyvet, mindenekelőtt önmagát nyitja ki. Nem az író s nem is az író által teremtett alakok fájdalmába vagy reményébe ütközik, hanem saját magáéba.",
+      "source": "Csoóri Sándor",
+      "id": 4,
+      "length": 168
+    },
+    {
+      "text": "Ne kérj soha bocsánatot azért, mert követed az álmaidat! De azt megkérdezheted magadtól, hogy valóban ez-e az álmod.",
+      "source": "Karácsonyi vallomások",
+      "id": 5,
+      "length": 116
+    },
+    {
+      "text": "A pillanatban élek. Hamarosan, talán már holnap, elfelejtem, hogy itt álltam, és beszédet mondtam. De az, hogy talán már holnap elfelejtem, nem jelenti azt, hogy nem éltem meg a ma minden pillanatát. El fogom felejteni a mát, de ez nem jelenti azt, hogy a mai nap nem számít.",
+      "source": "Megmaradt Alice-nek",
+      "id": 6,
+      "length": 275
+    },
+    {
+      "text": "Gyerekként úgy ismerkedtem meg a webdesignnal, hogy lemásoltam a menő oldalakat. Megnéztem az oldal forrását a böngészőben, és ott is volt a kód, amit copy-paste-eltem, egy kicsit átalakítottam, beleírtam a nevemet, és tessék, máris az enyém volt. Forrás megtekintése. Mi lenne, ha embereken is működne? Vajon szívesen megnéznénk?",
+      "source": "Mr. Robot",
+      "id": 7,
+      "length": 330
+    },
+    {
+      "text": "A fontos információk a számtalan szűrő miatt a modern korban nemigen jutnak el a döntéshozókig, ezért is olyan a világ, amilyen.",
+      "source": "Spiró György",
+      "id": 8,
+      "length": 128
+    },
+    {
+      "text": "Az életben mindig van valami, ami megér egy mosolyt.",
+      "source": "Marilyn Monroe",
+      "id": 9,
+      "length": 52
+    },
+    {
+      "text": "Az élet nem arról szól, hogy várjuk, hogy a vihar elmúljon, hanem arról, hogy megtanuljuk, hogyan táncoljunk az esőben.",
+      "source": "Seneca",
+      "id": 10,
+      "length": 119
+    },
+    {
+      "text": "Bátrabb vagy, mint hinnéd, és erősebb, mint amilyennek látsz, és okosabb, mint gondolnád.",
+      "source": "AA enyém",
+      "id": 11,
+      "length": 89
+    },
+    {
+      "text": "Egy gyermek egyedül a könyvével valahol bent a lélek titkos szobáiban saját képeket alkot, amelyek minden mást felülmúlnak. Ezekre a képekre az embereknek szüksége van. Azon a napon, amikor a gyerekek fantáziája többé már nem tudja megalkotni őket, azon a napon az emberiség szegény lesz. Minden nagy dolog, ami a világban történt, először egy ember fantáziájában történt, és hogy a holnap világa hogyan fog kinézni, nagyrészt annak a képzelőerőnek a mértékétől függ, amit azok birtokolnak, akik éppen most tanulnak meg olvasni. Ezért van szüksége a gyerekeknek könyvekre.",
+      "source": "Astrid Lingren",
+      "id": 12,
+      "length": 572
+    },
+    {
+      "text": "Csak a vér s a nyelv tudja összetartani az embereket s a közös múlt emléke. Ha ez megszűnik, fölbomlik a világ.",
+      "source": "Ismeretlen",
+      "id": 13,
+      "length": 111
+    },
+    {
+      "text": "A gondolkodás a létező legnehezebb munka, ez az oka annak, hogy olyan kevesen foglalkoznak vele.",
+      "source": "Henry Ford",
+      "id": 14,
+      "length": 96
+    },
+    {
+      "text": "Hasonlítsd össze magad a jobbal és elégedetlen vagy, de hasonlítsd össze magad a legrosszabbal és máris több vagy az elégnél.",
+      "source": "kínai közmondás",
+      "id": 15,
+      "length": 125
+    },
+    {
+      "text": "Létfontosságú, hogy az ember időnként olyasmivel foglalkozzon, ami nem létfontosságú.",
+      "source": "Mérő László",
+      "id": 16,
+      "length": 85
+    },
+    {
+      "text": "Aki focizott vagy aki valódi drukker, az tudja, a futball a győzteseké. Idegen a játék szellemétől például azt mondani, hogy inkább játsszunk jól, szépen, és veszítsünk, mint rossz játékkal nyerjünk. Nem. Nyerni kell. És ha nyerünk, azt úgyse lehet mindig rossz játékkal.",
+      "source": "Esterházy Péter",
+      "id": 17,
+      "length": 271
+    },
+    {
+      "text": "Semmiben sem nyilvánul meg olyan világosan az emberek jelleme, mint a játékban.",
+      "source": "Lev Tolsztoj",
+      "id": 18,
+      "length": 79
+    },
+    {
+      "text": "Akinek a világon semmije sem maradt, az tudja a legjobban, mire van igazán szüksége.",
+      "source": "Erich Kästner",
+      "id": 19,
+      "length": 84
+    },
+    {
+      "text": "Mindent a maga idejében kell megcselekedni, nem gyáván utólag okosnak lenni.",
+      "source": "Sárándi József",
+      "id": 20,
+      "length": 76
+    },
+    {
+      "text": "Az igazi tiszteletet ki kell érdemelni. Nem lehet örökölni, sem megvenni. És erővel sem lehet kicsikarni.",
+      "source": "Assassin's Creed",
+      "id": 21,
+      "length": 105
+    },
+    {
+      "text": "Az ember hajt az országúton, és meglát egy kígyót, mozdulatlanul az úttest közepén. A fickó megállt, és látta, hogy a kígyó megsebesült. Ezért hazavitte, ápolta, meggyógyította. Amikor a kígyó fölépült, kinyitotta neki a bejárati ajtót, hogy elmehessen. Ahogy a csörgőkígyó kifelé tekergődzött, megmarta a lábán. Mielőtt a méreg végzett volna vele, még odaszólt a kígyónak: \"Befogadtalak, etettelek, meggyógyítottam a sebeidet, és most azzal fizetsz, hogy megmarsz?\" A kígyó megállt, és azt válaszolta: \"Ez mind igaz. De mindeközben végig tudtad, hogy én kígyó vagyok.\"",
+      "source": "Steve Berry",
+      "id": 22,
+      "length": 569
+    },
+    {
+      "text": "Jobb, ha az ember próbálkozik és kudarcot vall, mint ha egyszerűen csak feladná.",
+      "source": "Kate Morton",
+      "id": 23,
+      "length": 80
+    },
+    {
+      "text": "Az apróka pók-apóka, s a porhanyó potrohú pókanyó a pékségben a szennyezett mennyezetre nyálból való máló hálót font, - pont.",
+      "source": "Romhányi József",
+      "id": 24,
+      "length": 125
+    },
+    {
+      "text": "Ha meg akarod tudni, miként gondolkodik valaki, hallgasd meg, hogyan beszél.",
+      "source": "Ismeretlen",
+      "id": 25,
+      "length": 76
+    },
+    {
+      "text": "Végül is mindnyájan azért vagyunk a földön, hogy nevessünk. Amelyik napon nem nevetünk, az elveszett nap. Aztán meg az az egyetlen nyugtató, amelynek nincs mellékhatása. A nevetés nem öl: hiszen mind élünk. Ahogy a kínaiak mondják: legyél szegény vagy gazdag, elégedj meg a sorsoddal, mert bolond az, aki nem neveti ki a körülményeket.",
+      "source": "Temesi Ferenc",
+      "id": 26,
+      "length": 335
+    },
+    {
+      "text": "Az emberek sokféleképpen voltak bölcsek, de nevetni egyformán nevettek.",
+      "source": "Samuel Johnson",
+      "id": 27,
+      "length": 71
+    },
+    {
+      "text": "Az otthon sok kényelmet megenged; de még a családtagok előtt se menjen ez mértéken túl.",
+      "source": "Kalocsa Róza",
+      "id": 28,
+      "length": 87
+    },
+    {
+      "text": "Aki boldogtalan nem volt, nem tudja megbecsülni boldogságát.",
+      "source": "Petőfi Sándor",
+      "id": 29,
+      "length": 60
+    },
+    {
+      "text": "Ha hosszú távokat fut az ember, nem nehéz, sőt olykor szükséges is kikapcsolni az agyunkat.",
+      "source": "Scott Jurek",
+      "id": 30,
+      "length": 91
+    },
+    {
+      "text": "Ezért varázslatos úton lenni: néha azt is elfelejted, hova mész.",
+      "source": "Carol és a világvége",
+      "id": 31,
+      "length": 64
+    },
+    {
+      "text": "Abban a pillanatban, amikor elfogadod a neked adott gondokat, az összes ajtó kinyílik.",
+      "source": "Rumi",
+      "id": 32,
+      "length": 86
+    },
+    {
+      "text": "Aztán egyszer csak szörnyű reccsenés hallatszik... Majd még egy. Mintha szétszakadtak volna a hajót tartó eresztékek, a fedélzet egyik oldala megemelkedik, miközben a másik oldal majdhogynem belemerül a vízbe.",
+      "source": "Berg Judit: Rumini és az elsüllyedt világ",
+      "id": 33,
+      "length": 209
+    },
+    {
+      "text": "Egy népet nem a testi hasonlóság, hanem a közös múlt, a hasonló gond, az egy haza levegője egyesít s választ el egy más múltú és más jelenű néptől. Magyar az, akinek nyelve és esze magyarul forog. Becsületesen nem lehet más vizsgát találni arra, hogy kit tartsunk igazán magyarnak. Nem könnyű vizsga ez. Sokkal nehezebb annál, ami elé a fajta testi jegyeinek kutatói állítják az embert. Itt a lelket kell kitenni.",
+      "source": "Illyés Gyula: Ki a magyar?",
+      "id": 34,
+      "length": 413
+    },
+    {
+      "text": "Szent-Györgyi Albert 1893-ban született Budapesten, aki egyben a leghíresebb magyar feltalálók egyike is. Biokémikus és orvos, aki 1937-ben Nobel-díjat kapott a C-vitamin felfedezéséért és a biológiai égési folyamatok kutatásáért.",
+      "source": "www.10-legjobb.blog.hu: 10 leghíresebb magyar ember a világon",
+      "id": 35,
+      "length": 230
+    },
+    {
+      "text": "Talán nincs is olyan felnőtt magyar, aki ne hallott volna róla. Ő olyan a költészetben, mint a legkedveltebb fagyi ízek között a csokoládé. Népszerűsége időtlen. Petőfi Sándor 1823-ban született Kiskőrösön. Költő és forradalmár, aki a magyar romantikus költészet egyik legnagyobb alakja.",
+      "source": "www.10-legjobb.blog.hu: 10 leghíresebb magyar ember a világon",
+      "id": 36,
+      "length": 287
+    },
+    {
+      "text": "Míg egy ujjal mutogatsz valakire, másik négy ujjad magadra mutat.",
+      "source": "Közmondás",
+      "id": 37,
+      "length": 65
+    },
+    {
+      "text": "A hazugság már félig megkerülte a világot, amikor az igazság még csak a nadrágját húzza.",
+      "source": "Közmondás",
+      "id": 38,
+      "length": 88
+    },
+    {
+      "text": "Majd ha az ember kivágja az utolsó fát, megmérgezi az utolsó folyó vizét, kifogja az utolsó halat is, akkor rádöbben, hogy a pénzt nem lehet megenni.",
+      "source": "Közmondás",
+      "id": 39,
+      "length": 149
+    },
+    {
+      "text": "Az élet nagy ajándék, így nem áll szándékomban elpazarolni. Sosem tudni, ki osztja a következő lapot. Az ember megtanulja elfogadni a sorsát. Minden egyes nap számít.",
+      "source": "Titanic",
+      "id": 40,
+      "length": 166
+    },
+    {
+      "text": "A gyerek szavát, hiába is őszinte, nem hallják meg, akik elfelejtettek hallani.",
+      "source": "Harry Potter",
+      "id": 41,
+      "length": 79
+    },
+    {
+      "text": "Ha hallasz egy hangot magadban, amely azt mondja: „Nem tudsz festeni”, akkor mindenképp fess, és ez a hang elnémul.",
+      "source": "Vincent Van Gogh",
+      "id": 42,
+      "length": 115
+    },
+    {
+      "text": "A kreativitás csak dolgok összekapcsolása. Amikor megkérdezed a kreatív embereket, hogyan csináltak valamit, egy kicsit bűntudatot éreznek, mert valójában nem csinálták, csak láttak valamit. Egy idő után ez természetessé válik számukra.",
+      "source": "Steve Jobs",
+      "id": 43,
+      "length": 236
+    },
+    {
+      "text": "Tanulj a tegnapból, élj a mának, remélj a holnapban. A lényeg, hogy sose hagyd abba a kérdezést.",
+      "source": "Albert Einstein",
+      "id": 44,
+      "length": 96
+    },
+    {
+      "text": "Nem a legerősebb faj marad fenn, és nem is a legintelligensebb, hanem az, amelyik a legjobban alkalmazkodik a változásokhoz.",
+      "source": "Charles Darwin",
+      "id": 45,
+      "length": 124
+    },
+    {
+      "text": "Mindenki híres akar lenni, de senki nem akar dolgozni érte. Én ezen élek. Keményen dolgozol, hogy keményen játszhass. A nap végén mindent beleadsz, és végül kifizetődik. Lehet, hogy egy év múlva, lehet, hogy 30 év múlva. Végül a kemény munka meghozza gyümölcsét.",
+      "source": "Kevin Hart",
+      "id": 46,
+      "length": 262
+    },
+    {
+      "text": "A múlt is fájhat, de az én filozófiám szerint vagy elugrasz előle, vagy tanulsz belőle.",
+      "source": "Az oroszlánkirály -1994",
+      "id": 47,
+      "length": 87
+    },
+    {
+      "text": "Talán a legnagyobb kockázat, amit valaha is vállalhatsz, hogy olyannak látnak téged, amilyen valójában vagy.",
+      "source": "Hamupipőke -1950",
+      "id": 48,
+      "length": 108
+    },
+    {
+      "text": "A dolog, amik miatt különbözöm másoktól, azok a dolgok, amik miatt én vagyok én!",
+      "source": "Micimackó kalandjai -1977",
+      "id": 49,
+      "length": 80
+    },
+    {
+      "text": "Mátra alján, falu szélén,  lakik az én öreg néném melegszívű, dolgos, derék,  tőle tudom ezt a mesét. Őzgidácska, sete-suta, rátévedt az országútra, megbotlott egy kidőlt fában ,eltörött a gida lába. Panaszosan sír szegényke, arra ballag öreg néne,  ölbe veszi, megsajnálja, haza viszi kis házába.",
+      "source": "Fazekas Anna: Öreg Néne őzikéje",
+      "id": 50,
+      "length": 297
+    },
+    {
+      "text": "Az ember éppen ott nincs otthon, ahol van. Az ember azt hiszi, hogy ott lenne otthon, ahova kívánkozik.",
+      "source": "Zsolt Béla",
+      "id": 51,
+      "length": 103
+    },
+    {
+      "text": "A magyarság nem kalapdísz, hanem a szíve mélyében viseli a magyar, mint tenger csigája a gyöngyét. A magyarságunk érzése mélyen bent ég bennünk, hogy szinte magunk sem tudunk róla, mint a tűzhányó hegyek, amelyek hideg kőhegyek, de egyszer megmordulnak.",
+      "source": "Gárdonyi Géza",
+      "id": 52,
+      "length": 253
+    }
+  ]
+}
diff --git a/frontend/static/themes/pale_nimbus.css b/frontend/static/themes/pale_nimbus.css
new file mode 100644
index 000000000000..ec639f07ee5c
--- /dev/null
+++ b/frontend/static/themes/pale_nimbus.css
@@ -0,0 +1,12 @@
+:root {
+  --bg-color: #433e4c;
+  --main-color: #94ffc2;
+  --caret-color: #9efffd;
+  --sub-color: #ffaca3;
+  --sub-alt-color: #694f5e;
+  --text-color: #feffdb;
+  --error-color: #ff5c5c;
+  --error-extra-color: #ff0000;
+  --colorful-error-color: #ff3874;
+  --colorful-error-extra-color: #c2386f;
+}
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 914917de4f39..faaa7559e331 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -9,9 +9,10 @@
     "target": "ES6",
     "noEmit": true,
     "paths": {
-      "virtual:language-hashes": ["./src/ts/module.d.ts"]
+      "virtual:language-hashes": ["./src/ts/virtual-language-hashes.d.ts"],
+      "virtual:env-config": ["./src/ts/virtual-env-config.d.ts"]
     }
   },
-  "include": ["./src/**/*.ts", "./scripts/**/*.ts"],
+  "include": ["./src/**/*.ts", "./scripts/**/*.ts", "vite-plugins/**/*.ts"],
   "exclude": ["node_modules", "build", "setup-tests.ts", "**/*.spec.ts"]
 }
diff --git a/frontend/vite-plugins/env-config.ts b/frontend/vite-plugins/env-config.ts
new file mode 100644
index 000000000000..f74e9c4c5713
--- /dev/null
+++ b/frontend/vite-plugins/env-config.ts
@@ -0,0 +1,61 @@
+import { Plugin } from "vite";
+import { EnvConfig } from "virtual:env-config";
+
+const virtualModuleId = "virtual:env-config";
+const resolvedVirtualModuleId = "\0" + virtualModuleId;
+
+const developmentConfig: EnvConfig = {
+  isDevelopment: true,
+  backendUrl: fallbackEnv("BACKEND_URL", "http://localhost:5005"),
+  clientVersion: "DEVELOPMENT_CLIENT",
+  recaptchaSiteKey: "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI",
+  quickLoginEmail: process.env["QUICK_LOGIN_EMAIL"],
+  quickLoginPassword: process.env["QUICK_LOGIN_PASSWORD"],
+};
+const productionConfig: Omit<EnvConfig, "clientVersion"> = {
+  isDevelopment: false,
+  backendUrl: fallbackEnv("BACKEND_URL", "https://api.monkeytype.com"),
+  recaptchaSiteKey: process.env["RECAPTCHA_SITE_KEY"] ?? "",
+  quickLoginEmail: undefined,
+  quickLoginPassword: undefined,
+};
+
+export function envConfig(
+  options:
+    | {
+        isDevelopment: true;
+      }
+    | {
+        isDevelopment: false;
+        clientVersion: string;
+      }
+): Plugin {
+  return {
+    name: "virtual-env-config",
+    resolveId(id) {
+      if (id === virtualModuleId) return resolvedVirtualModuleId;
+      return;
+    },
+    load(id) {
+      if (id === resolvedVirtualModuleId) {
+        const envConfig = options.isDevelopment
+          ? developmentConfig
+          : {
+              ...productionConfig,
+              clientVersion: options.clientVersion,
+            };
+
+        return `
+          export const envConfig = ${JSON.stringify(envConfig)};
+        `;
+      }
+      return;
+    },
+  };
+}
+
+function fallbackEnv(envVariable: string, fallback: string): string {
+  const value = process.env[envVariable];
+  if (value === null || value === undefined || value === "") return fallback;
+  return value;
+}
diff --git a/frontend/scripts/font-preview.ts b/frontend/vite-plugins/font-preview.ts
similarity index 66%
rename from frontend/scripts/font-preview.ts
rename to frontend/vite-plugins/font-preview.ts
index d8845120c7b9..84c0e1ad2472 100644
--- a/frontend/scripts/font-preview.ts
+++ b/frontend/vite-plugins/font-preview.ts
@@ -1,3 +1,4 @@
+import { Plugin } from "vite";
 import * as fs from "fs";
 import * as path from "path";
 import { fileURLToPath } from "url";
@@ -9,9 +10,30 @@ import { KnownFontName } from "@monkeytype/schemas/fonts";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-export async function generatePreviewFonts(
-  debug: boolean = false
-): Promise<void> {
+/**
+ * Generate a preview file from each font in `static/webfonts` into `static/webfonts-preview`.
+ * A preview file only contains the characters needed to show the preview.
+ * @returns
+ */
+export function fontPreview(): Plugin {
+  return {
+    name: "vite-plugin-webfonts-preview",
+    apply: "build",
+    async buildStart() {
+      const start = performance.now();
+      console.log("\nCreating webfonts preview...");
+
+      await generatePreviewFonts();
+
+      const end = performance.now();
+      console.log(
+        `Creating webfonts preview took ${Math.round(end - start)} ms`
+      );
+    },
+  };
+}
+
+async function generatePreviewFonts(debug: boolean = false): Promise<void> {
   const srcDir = __dirname + "/../static/webfonts";
   const targetDir = __dirname + "/../static/webfonts-preview";
   fs.mkdirSync(targetDir, { recursive: true });
diff --git a/frontend/scripts/fontawesome.ts b/frontend/vite-plugins/fontawesome-subset.ts
similarity index 82%
rename from frontend/scripts/fontawesome.ts
rename to frontend/vite-plugins/fontawesome-subset.ts
index 3cd3763201c9..3b47eea55469 100644
--- a/frontend/scripts/fontawesome.ts
+++ b/frontend/vite-plugins/fontawesome-subset.ts
@@ -1,6 +1,38 @@
+import { Plugin } from "vite";
 import * as fs from "fs";
 import { createRequire } from "module";
 import * as path from "path";
+import { fontawesomeSubset as createFontawesomeSubset } from "fontawesome-subset";
+
+/**
+ * Detect fontawesome icons used by the application and creates subset font files only containing the used icons.
+ * @param options
+ * @returns
+ */
+export function fontawesomeSubset(): Plugin {
+  return {
+    name: "vite-plugin-fontawesome-subset",
+    apply: "build",
+    async buildStart() {
+      const start = performance.now();
+      console.log("\nCreating fontawesome subset...");
+
+      const fontawesomeClasses = getFontawesomeConfig();
+      await createFontawesomeSubset(
+        fontawesomeClasses,
+        "src/webfonts-generated",
+        {
+          targetFormats: ["woff2"],
+        }
+      );
+
+      const end = performance.now();
+      console.log(
+        `Creating fontawesome subset took ${Math.round(end - start)} ms`
+      );
+    },
+  };
+}
 
 type FontawesomeConfig = {
   /* used regular icons without `fa-` prefix*/
@@ -56,8 +88,7 @@ const modules2 = {
  * @param {boolean} debug - Enable debug output
  * @returns {FontawesomeConfig} - used icons
  */
-
-export function getFontawesomeConfig(debug = false): FontawesomeConfig {
+function getFontawesomeConfig(debug = false): FontawesomeConfig {
   const time = Date.now();
   const srcFiles = findAllFiles(
     "./src",
diff --git a/frontend/scripts/language-hashes.ts b/frontend/vite-plugins/language-hashes.ts
similarity index 80%
rename from frontend/scripts/language-hashes.ts
rename to frontend/vite-plugins/language-hashes.ts
index 9b4e2320030b..da53914740f4 100644
--- a/frontend/scripts/language-hashes.ts
+++ b/frontend/vite-plugins/language-hashes.ts
@@ -5,9 +5,8 @@ import { createHash } from "crypto";
 
 const virtualModuleId = "virtual:language-hashes";
 const resolvedVirtualModuleId = "\0" + virtualModuleId;
-let skip = false;
 
-export function languageHashes(): Plugin {
+export function languageHashes(options?: { skip: boolean }): Plugin {
   return {
     name: "virtual-language-hashes",
     resolveId(id) {
@@ -16,19 +15,17 @@ export function languageHashes(): Plugin {
     },
     load(id) {
       if (id === resolvedVirtualModuleId) {
-        const hashes: Record<string, string> = skip ? {} : getHashes();
+        if (options?.skip) {
+          console.log("Skipping language hashing in dev environment.");
+        }
+
+        const hashes: Record<string, string> = options?.skip ? {} : getHashes();
         return `
           export const languageHashes = ${JSON.stringify(hashes)};
         `;
       }
       return;
     },
-    configResolved(resolvedConfig) {
-      if (resolvedConfig?.define?.["IS_DEVELOPMENT"] === "true") {
-        skip = true;
-        console.log("Skipping language hashing in dev environment.");
-      }
-    },
   };
 }
 
diff --git a/frontend/vite-plugins/minify-json.ts b/frontend/vite-plugins/minify-json.ts
new file mode 100644
index 000000000000..73283a769055
--- /dev/null
+++ b/frontend/vite-plugins/minify-json.ts
@@ -0,0 +1,76 @@
+import { Plugin } from "vite";
+import { readdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import path from "node:path";
+
+/**
+ * Minifies all json files in the `dist` directory
+ * @returns
+ */
+export function minifyJson(): Plugin {
+  return {
+    name: "minify-json",
+    apply: "build",
+    generateBundle() {
+      let totalOriginalSize = 0;
+      let totalMinifiedSize = 0;
+
+      const minifyJsonFiles = (dir: string): void => {
+        readdirSync(dir).forEach((file) => {
+          const sourcePath = path.join(dir, file);
+          const stat = statSync(sourcePath);
+
+          if (stat.isDirectory()) {
+            minifyJsonFiles(sourcePath);
+          } else if (path.extname(file) === ".json") {
+            const originalContent = readFileSync(sourcePath, "utf8");
+            const originalSize = Buffer.byteLength(originalContent, "utf8");
+            const minifiedContent = JSON.stringify(JSON.parse(originalContent));
+            const minifiedSize = Buffer.byteLength(minifiedContent, "utf8");
+
+            totalOriginalSize += originalSize;
+            totalMinifiedSize += minifiedSize;
+
+            writeFileSync(sourcePath, minifiedContent);
+
+            /*
+            const savings =
+              ((originalSize - minifiedSize) / originalSize) * 100;
+            console.log(
+              `\x1b[0m \x1b[36m${sourcePath}\x1b[0m | ` +
+                `\x1b[90mOriginal: ${originalSize} bytes\x1b[0m | ` +
+                `\x1b[90mMinified: ${minifiedSize} bytes\x1b[0m | ` +
+                `\x1b[32mSavings: ${savings.toFixed(2)}%\x1b[0m`
+            );
+            */
+          }
+        });
+      };
+
+      // console.log("\n\x1b[1mMinifying JSON files...\x1b[0m\n");
+      const start = performance.now();
+
+      minifyJsonFiles("./dist");
+
+      const end = performance.now();
+      const totalSavings =
+        ((totalOriginalSize - totalMinifiedSize) / totalOriginalSize) * 100;
+
+      console.log(
+        `\n\n\x1b[1mJSON Minification Summary:\x1b[0m\n` +
+          `  \x1b[90mTotal original size: ${(
+            totalOriginalSize /
+            1024 /
+            1024
+          ).toFixed(2)} mB\x1b[0m\n` +
+          `  \x1b[90mTotal minified size: ${(
+            totalMinifiedSize /
+            1024 /
+            1024
+          ).toFixed(2)} mB\x1b[0m\n` +
+          `  \x1b[32mTotal savings: ${totalSavings.toFixed(
+            2
+          )}%\x1b[0m took ${Math.round(end - start)} ms\n`
+      );
+    },
+  };
+}
diff --git a/frontend/vite-plugins/version-file.ts b/frontend/vite-plugins/version-file.ts
new file mode 100644
index 000000000000..f1ab589a8ade
--- /dev/null
+++ b/frontend/vite-plugins/version-file.ts
@@ -0,0 +1,20 @@
+import { Plugin } from "vite";
+import path from "node:path";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+export function versionFile(options: { clientVersion: string }): Plugin {
+  return {
+    name: "generate-version-json",
+    apply: "build",
+
+    closeBundle() {
+      const distPath = path.resolve("./dist");
+      if (!existsSync(distPath)) {
+        mkdirSync(distPath, { recursive: true });
+      }
+
+      const versionJson = JSON.stringify({ version: options.clientVersion });
+      const versionPath = path.resolve(distPath, "version.json");
+      writeFileSync(versionPath, versionJson);
+    },
+  };
+}
diff --git a/frontend/vite.config.dev.js b/frontend/vite.config.dev.js
index d956f23c9fd4..2d6fab7f021b 100644
--- a/frontend/vite.config.dev.js
+++ b/frontend/vite.config.dev.js
@@ -2,10 +2,14 @@ import { checker } from "vite-plugin-checker";
 import Inspect from "vite-plugin-inspect";
 import path from "node:path";
 import { getFontsConig } from "./vite.config";
+import { envConfig } from "./vite-plugins/env-config";
+import { languageHashes } from "./vite-plugins/language-hashes";
 
 /** @type {import("vite").UserConfig} */
 export default {
   plugins: [
+    envConfig({ isDevelopment: true }),
+    languageHashes({ skip: true }),
     checker({
       typescript: {
         tsconfigPath: path.resolve(__dirname, "./tsconfig.json"),
@@ -32,18 +36,6 @@ export default {
       },
     },
   },
-  define: {
-    BACKEND_URL: JSON.stringify(
-      process.env.BACKEND_URL || "http://localhost:5005"
-    ),
-    IS_DEVELOPMENT: JSON.stringify(true),
-    CLIENT_VERSION: JSON.stringify("DEVELOPMENT_CLIENT"),
-    RECAPTCHA_SITE_KEY: JSON.stringify(
-      "6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI"
-    ),
-    QUICK_LOGIN_EMAIL: JSON.stringify(process.env.QUICK_LOGIN_EMAIL),
-    QUICK_LOGIN_PASSWORD: JSON.stringify(process.env.QUICK_LOGIN_PASSWORD),
-  },
   build: {
     outDir: "../dist",
   },
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 11ce0ba5c726..bf2572157c8f 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -6,12 +6,10 @@ import PROD_CONFIG from "./vite.config.prod";
 import DEV_CONFIG from "./vite.config.dev";
 import MagicString from "magic-string";
 import { Fonts } from "./src/ts/constants/fonts";
-import { languageHashes } from "./scripts/language-hashes";
 
 /** @type {import("vite").UserConfig} */
 const BASE_CONFIG = {
   plugins: [
-    languageHashes(),
     {
       name: "simple-jquery-inject",
       async transform(src, id) {
diff --git a/frontend/vite.config.prod.js b/frontend/vite.config.prod.js
index 94acf26ac503..4dd63bbfa2ac 100644
--- a/frontend/vite.config.prod.js
+++ b/frontend/vite.config.prod.js
@@ -1,24 +1,19 @@
-import { fontawesomeSubset } from "fontawesome-subset";
-import { getFontawesomeConfig } from "./scripts/fontawesome";
-import { generatePreviewFonts } from "./scripts/font-preview";
 import { VitePWA } from "vite-plugin-pwa";
 import replace from "vite-plugin-filter-replace";
 import path from "node:path";
 import childProcess from "child_process";
 import { checker } from "vite-plugin-checker";
-import { writeFileSync } from "fs";
 // eslint-disable-next-line import/no-unresolved
 import UnpluginInjectPreload from "unplugin-inject-preload/vite";
-import {
-  existsSync,
-  mkdirSync,
-  readdirSync,
-  readFileSync,
-  statSync,
-} from "node:fs";
 import { ViteMinifyPlugin } from "vite-plugin-minify";
 import { sentryVitePlugin } from "@sentry/vite-plugin";
 import { getFontsConig } from "./vite.config";
+import { fontawesomeSubset } from "./vite-plugins/fontawesome-subset";
+import { fontPreview } from "./vite-plugins/font-preview";
+import { envConfig } from "./vite-plugins/env-config";
+import { languageHashes } from "./vite-plugins/language-hashes";
+import { minifyJson } from "./vite-plugins/minify-json";
+import { versionFile } from "./vite-plugins/version-file";
 
 function pad(numbers, maxLength, fillString) {
   return numbers.map((number) =>
@@ -59,39 +54,11 @@ function sassList(values) {
 /** @type {import("vite").UserConfig} */
 export default {
   plugins: [
-    {
-      name: "vite-plugin-fontawesome-subset",
-      apply: "build",
-      buildStart() {
-        const fontawesomeClasses = getFontawesomeConfig();
-        fontawesomeSubset(fontawesomeClasses, "src/webfonts-generated", {
-          targetFormats: ["woff2"],
-        });
-      },
-    },
-    {
-      name: "generate-version-json",
-      apply: "build",
-
-      closeBundle() {
-        const distPath = path.resolve(__dirname, "dist");
-        if (!existsSync(distPath)) {
-          mkdirSync(distPath, { recursive: true });
-        }
-
-        const version = CLIENT_VERSION;
-        const versionJson = JSON.stringify({ version });
-        const versionPath = path.resolve(distPath, "version.json");
-        writeFileSync(versionPath, versionJson);
-      },
-    },
-    {
-      name: "vite-plugin-webfonts-preview",
-      apply: "build",
-      buildStart() {
-        generatePreviewFonts();
-      },
-    },
+    envConfig({ isDevelopment: false, clientVersion: CLIENT_VERSION }),
+    languageHashes(),
+    fontawesomeSubset(),
+    versionFile({ clientVersion: CLIENT_VERSION }),
+    fontPreview(),
     checker({
       typescript: {
         tsconfigPath: path.resolve(__dirname, "./tsconfig.json"),
@@ -201,68 +168,7 @@ export default {
       ],
       injectTo: "head-prepend",
     }),
-    {
-      name: "minify-json",
-      apply: "build",
-      generateBundle() {
-        let totalOriginalSize = 0;
-        let totalMinifiedSize = 0;
-
-        const minifyJsonFiles = (dir) => {
-          readdirSync(dir).forEach((file) => {
-            const sourcePath = path.join(dir, file);
-            const stat = statSync(sourcePath);
-
-            if (stat.isDirectory()) {
-              minifyJsonFiles(sourcePath);
-            } else if (path.extname(file) === ".json") {
-              const originalContent = readFileSync(sourcePath, "utf8");
-              const originalSize = Buffer.byteLength(originalContent, "utf8");
-              const minifiedContent = JSON.stringify(
-                JSON.parse(originalContent)
-              );
-              const minifiedSize = Buffer.byteLength(minifiedContent, "utf8");
-
-              totalOriginalSize += originalSize;
-              totalMinifiedSize += minifiedSize;
-
-              writeFileSync(sourcePath, minifiedContent);
-
-              // const savings =
-              //   ((originalSize - minifiedSize) / originalSize) * 100;
-              // console.log(
-              //   `\x1b[0m \x1b[36m${sourcePath}\x1b[0m | ` +
-              //     `\x1b[90mOriginal: ${originalSize} bytes\x1b[0m | ` +
-              //     `\x1b[90mMinified: ${minifiedSize} bytes\x1b[0m | ` +
-              //     `\x1b[32mSavings: ${savings.toFixed(2)}%\x1b[0m`
-              // );
-            }
-          });
-        };
-
-        // console.log("\n\x1b[1mMinifying JSON files...\x1b[0m\n");
-
-        minifyJsonFiles("./dist");
-
-        const totalSavings =
-          ((totalOriginalSize - totalMinifiedSize) / totalOriginalSize) * 100;
-
-        console.log(
-          `\n\n\x1b[1mJSON Minification Summary:\x1b[0m\n` +
-            `  \x1b[90mTotal original size: ${(
-              totalOriginalSize /
-              1024 /
-              1024
-            ).toFixed(2)} mB\x1b[0m\n` +
-            `  \x1b[90mTotal minified size: ${(
-              totalMinifiedSize /
-              1024 /
-              1024
-            ).toFixed(2)} mB\x1b[0m\n` +
-            `  \x1b[32mTotal savings: ${totalSavings.toFixed(2)}%\x1b[0m\n`
-        );
-      },
-    },
+    minifyJson(),
   ],
   build: {
     sourcemap: process.env.SENTRY,
@@ -311,17 +217,6 @@ export default {
       },
     },
   },
-  define: {
-    BACKEND_URL: JSON.stringify(
-      process.env.BACKEND_URL || "https://api.monkeytype.com"
-    ),
-    IS_DEVELOPMENT: JSON.stringify(false),
-    CLIENT_VERSION: JSON.stringify(CLIENT_VERSION),
-    RECAPTCHA_SITE_KEY: JSON.stringify(process.env.RECAPTCHA_SITE_KEY),
-    QUICK_LOGIN_EMAIL: undefined,
-    QUICK_LOGIN_PASSWORD: undefined,
-  },
-
   css: {
     preprocessorOptions: {
       scss: {
diff --git a/frontend/vitest.config.ts b/frontend/vitest.config.ts
index b8f4993846fd..7081b6fae04f 100644
--- a/frontend/vitest.config.ts
+++ b/frontend/vitest.config.ts
@@ -1,5 +1,6 @@
 import { defineConfig } from "vitest/config";
-import { languageHashes } from "./scripts/language-hashes";
+import { languageHashes } from "./vite-plugins/language-hashes";
+import { envConfig } from "./vite-plugins/env-config";
 
 export default defineConfig({
   test: {
@@ -19,5 +20,5 @@ export default defineConfig({
     },
   },
 
-  plugins: [languageHashes()],
+  plugins: [languageHashes({ skip: true }), envConfig({ isDevelopment: true })],
 });
diff --git a/package.json b/package.json
index 315d71bea6bf..582a35ae6521 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@commitlint/cli": "17.7.1",
     "@commitlint/config-conventional": "19.2.2",
     "@monkeytype/release": "workspace:*",
-    "@vitest/coverage-v8": "4.0.4",
+    "@vitest/coverage-v8": "4.0.8",
     "conventional-changelog": "6.0.0",
     "eslint": "8.57.1",
     "husky": "8.0.1",
@@ -77,7 +77,7 @@
     "oxlint": "1.25.0",
     "prettier": "2.8.8",
     "turbo": "2.5.6",
-    "vitest": "4.0.4"
+    "vitest": "4.0.8"
   },
   "lint-staged": {
     "*.{json,scss,css,html}": [
@@ -89,6 +89,6 @@
       "eslint"
     ]
   },
-  "version": "25.44.0",
+  "version": "25.46.0",
   "packageManager": "pnpm@9.6.0"
 }
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 2e5a9e7ed2d9..65b7b15453f5 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -27,7 +27,7 @@
     "oxlint": "1.25.0",
     "tsup": "8.4.0",
     "typescript": "5.5.4",
-    "vitest": "4.0.4"
+    "vitest": "4.0.8"
   },
   "exports": {
     ".": {
diff --git a/packages/contracts/src/leaderboards.ts b/packages/contracts/src/leaderboards.ts
index d1ef48081e76..54ccbbc877e7 100644
--- a/packages/contracts/src/leaderboards.ts
+++ b/packages/contracts/src/leaderboards.ts
@@ -75,7 +75,7 @@ export type GetLeaderboardRankResponse = z.infer<
 
 export const DailyLeaderboardQuerySchema = LanguageAndModeQuerySchema.extend({
   daysBefore: z.literal(1).optional(),
-});
+}).merge(FriendsOnlyQuerySchema);
 export type DailyLeaderboardQuery = z.infer<typeof DailyLeaderboardQuerySchema>;
 
 export const GetDailyLeaderboardQuerySchema = DailyLeaderboardQuerySchema.merge(
@@ -86,7 +86,7 @@ export type GetDailyLeaderboardQuery = z.infer<
 >;
 export const GetDailyLeaderboardResponseSchema = responseWithData(
   LeaderboardResponseSchema.extend({
-    entries: z.array(LeaderboardEntrySchema.omit({ friendsRank: true })),
+    entries: z.array(LeaderboardEntrySchema),
     minWpm: z.number().nonnegative(),
   })
 );
@@ -102,7 +102,7 @@ export type GetDailyLeaderboardRankQuery = z.infer<
   typeof GetDailyLeaderboardRankQuerySchema
 >;
 export const GetLeaderboardDailyRankResponseSchema = responseWithNullableData(
-  LeaderboardEntrySchema.omit({ friendsRank: true })
+  LeaderboardEntrySchema
 );
 export type GetLeaderboardDailyRankResponse = z.infer<
   typeof GetLeaderboardDailyRankResponseSchema
@@ -110,9 +110,11 @@ export type GetLeaderboardDailyRankResponse = z.infer<
 
 //--------------------------------------------------------------------------
 
-const WeeklyXpLeaderboardQuerySchema = z.object({
-  weeksBefore: z.literal(1).optional(),
-});
+const WeeklyXpLeaderboardQuerySchema = z
+  .object({
+    weeksBefore: z.literal(1).optional(),
+  })
+  .merge(FriendsOnlyQuerySchema);
 
 export const GetWeeklyXpLeaderboardQuerySchema =
   WeeklyXpLeaderboardQuerySchema.merge(PaginationQuerySchema);
diff --git a/packages/funbox/package.json b/packages/funbox/package.json
index 2e254b08cbca..0aa8a256ddbf 100644
--- a/packages/funbox/package.json
+++ b/packages/funbox/package.json
@@ -20,7 +20,7 @@
     "oxlint": "1.25.0",
     "tsup": "8.4.0",
     "typescript": "5.5.4",
-    "vitest": "4.0.4"
+    "vitest": "4.0.8"
   },
   "dependencies": {
     "@monkeytype/schemas": "workspace:*",
diff --git a/packages/schemas/package.json b/packages/schemas/package.json
index caff5d6f3da8..3b9432967f77 100644
--- a/packages/schemas/package.json
+++ b/packages/schemas/package.json
@@ -23,7 +23,7 @@
     "oxlint": "1.25.0",
     "tsup": "8.4.0",
     "typescript": "5.5.4",
-    "vitest": "4.0.4"
+    "vitest": "4.0.8"
   },
   "exports": {
     ".": {
diff --git a/packages/schemas/src/configs.ts b/packages/schemas/src/configs.ts
index c5f6ebbe7452..020a17007694 100644
--- a/packages/schemas/src/configs.ts
+++ b/packages/schemas/src/configs.ts
@@ -68,6 +68,7 @@ export const RandomThemeSchema = z.enum([
   "light",
   "dark",
   "custom",
+  "auto",
 ]);
 export type RandomTheme = z.infer<typeof RandomThemeSchema>;
 
diff --git a/packages/schemas/src/languages.ts b/packages/schemas/src/languages.ts
index c5279e6176cf..5952e9a695a1 100644
--- a/packages/schemas/src/languages.ts
+++ b/packages/schemas/src/languages.ts
@@ -161,6 +161,7 @@ export const LanguageSchema = z.enum(
     "danish_1k",
     "danish_10k",
     "hungarian",
+    "hungarian_1k",
     "hungarian_2k",
     "norwegian_bokmal",
     "norwegian_bokmal_1k",
diff --git a/packages/schemas/src/leaderboards.ts b/packages/schemas/src/leaderboards.ts
index 6812676a39fe..96516c5590dc 100644
--- a/packages/schemas/src/leaderboards.ts
+++ b/packages/schemas/src/leaderboards.ts
@@ -1,5 +1,12 @@
 import { z } from "zod";
 
+const FriendsRankSchema = z
+  .number()
+  .nonnegative()
+  .int()
+  .optional()
+  .describe("only available on friendsOnly leaderboard");
+
 export const LeaderboardEntrySchema = z.object({
   wpm: z.number().nonnegative(),
   acc: z.number().nonnegative().min(0).max(100),
@@ -11,12 +18,7 @@ export const LeaderboardEntrySchema = z.object({
   discordId: z.string().optional(),
   discordAvatar: z.string().optional(),
   rank: z.number().nonnegative().int(),
-  friendsRank: z
-    .number()
-    .nonnegative()
-    .int()
-    .optional()
-    .describe("only available on friendsOnly leaderboard"),
+  friendsRank: FriendsRankSchema,
   badgeId: z.number().int().optional(),
   isPremium: z.boolean().optional(),
 });
@@ -59,5 +61,6 @@ export const XpLeaderboardEntrySchema = RedisXpLeaderboardEntrySchema.extend({
   totalXp: RedisXpLeaderboardScoreSchema,
   // dynamically added when generating response on the backend
   rank: z.number().nonnegative().int(),
+  friendsRank: FriendsRankSchema,
 });
 export type XpLeaderboardEntry = z.infer<typeof XpLeaderboardEntrySchema>;
diff --git a/packages/schemas/src/themes.ts b/packages/schemas/src/themes.ts
index c7c8c548ad4a..e31f7724bcd0 100644
--- a/packages/schemas/src/themes.ts
+++ b/packages/schemas/src/themes.ts
@@ -187,6 +187,7 @@ export const ThemeNameSchema = z.enum(
     "watermelon",
     "wavez",
     "witch_girl",
+    "pale_nimbus",
   ],
   {
     errorMap: customEnumErrorHandler("Must be a known theme"),
diff --git a/packages/util/package.json b/packages/util/package.json
index 8a22917dfcd9..d774116a31e6 100644
--- a/packages/util/package.json
+++ b/packages/util/package.json
@@ -19,7 +19,7 @@
     "oxlint": "1.25.0",
     "tsup": "8.4.0",
     "typescript": "5.5.4",
-    "vitest": "4.0.4",
+    "vitest": "4.0.8",
     "zod": "3.23.8"
   },
   "exports": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 60e6528f4bbc..68bf7dbe3015 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
         specifier: workspace:*
         version: link:packages/release
       '@vitest/coverage-v8':
-        specifier: 4.0.4
-        version: 4.0.4(vitest@4.0.4(@types/node@20.5.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
+        specifier: 4.0.8
+        version: 4.0.8(vitest@4.0.8(@types/node@20.5.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
       conventional-changelog:
         specifier: 6.0.0
         version: 6.0.0(conventional-commits-filter@5.0.0)
@@ -48,8 +48,8 @@ importers:
         specifier: 2.5.6
         version: 2.5.6
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@20.5.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@20.5.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
   backend:
     dependencies:
@@ -229,8 +229,8 @@ importers:
         specifier: 10.0.0
         version: 10.0.0
       '@vitest/coverage-v8':
-        specifier: 4.0.4
-        version: 4.0.4(vitest@4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
+        specifier: 4.0.8
+        version: 4.0.8(vitest@4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
       concurrently:
         specifier: 8.2.2
         version: 8.2.2
@@ -262,8 +262,8 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
   frontend:
     dependencies:
@@ -410,8 +410,8 @@ importers:
         specifier: 5.0.2
         version: 5.0.2
       '@vitest/coverage-v8':
-        specifier: 4.0.4
-        version: 4.0.4(vitest@4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
+        specifier: 4.0.8
+        version: 4.0.8(vitest@4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
       autoprefixer:
         specifier: 10.4.20
         version: 10.4.20(postcss@8.4.31)
@@ -434,8 +434,8 @@ importers:
         specifier: 4.4.0
         version: 4.4.0(@fortawesome/fontawesome-free@5.15.4)
       happy-dom:
-        specifier: 20.0.2
-        version: 20.0.2
+        specifier: 20.0.10
+        version: 20.0.10
       madge:
         specifier: 8.0.0
         version: 8.0.0(typescript@5.5.4)
@@ -491,8 +491,8 @@ importers:
         specifier: 1.1.0
         version: 1.1.0(vite@7.1.12(@types/node@24.9.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))(workbox-build@7.1.1)(workbox-window@7.1.0)
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
   packages/contracts:
     dependencies:
@@ -531,8 +531,8 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
   packages/eslint-config:
     devDependencies:
@@ -595,8 +595,8 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
   packages/oxlint-config: {}
 
@@ -656,8 +656,8 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
   packages/tsup-config:
     dependencies:
@@ -707,8 +707,8 @@ importers:
         specifier: 5.5.4
         version: 5.5.4
       vitest:
-        specifier: 4.0.4
-        version: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+        specifier: 4.0.8
+        version: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
       zod:
         specifier: 3.23.8
         version: 3.23.8
@@ -3424,20 +3424,20 @@ packages:
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
 
-  '@vitest/coverage-v8@4.0.4':
-    resolution: {integrity: sha512-YM7gDj2TX2AXyGLz0p/B7hvTsTfaQc+kSV/LU0nEnKlep/ZfbdCDppPND4YQiQC43OXyrhkG3y8ZSTqYb2CKqQ==}
+  '@vitest/coverage-v8@4.0.8':
+    resolution: {integrity: sha512-wQgmtW6FtPNn4lWUXi8ZSYLpOIb92j3QCujxX3sQ81NTfQ/ORnE0HtK7Kqf2+7J9jeveMGyGyc4NWc5qy3rC4A==}
     peerDependencies:
-      '@vitest/browser': 4.0.4
-      vitest: 4.0.4
+      '@vitest/browser': 4.0.8
+      vitest: 4.0.8
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
 
-  '@vitest/expect@4.0.4':
-    resolution: {integrity: sha512-0ioMscWJtfpyH7+P82sGpAi3Si30OVV73jD+tEqXm5+rIx9LgnfdaOn45uaFkKOncABi/PHL00Yn0oW/wK4cXw==}
+  '@vitest/expect@4.0.8':
+    resolution: {integrity: sha512-Rv0eabdP/xjAHQGr8cjBm+NnLHNoL268lMDK85w2aAGLFoVKLd8QGnVon5lLtkXQCoYaNL0wg04EGnyKkkKhPA==}
 
-  '@vitest/mocker@4.0.4':
-    resolution: {integrity: sha512-UTtKgpjWj+pvn3lUM55nSg34098obGhSHH+KlJcXesky8b5wCUgg7s60epxrS6yAG8slZ9W8T9jGWg4PisMf5Q==}
+  '@vitest/mocker@4.0.8':
+    resolution: {integrity: sha512-9FRM3MZCedXH3+pIh+ME5Up2NBBHDq0wqwhOKkN4VnvCiKbVxddqH9mSGPZeawjd12pCOGnl+lo/ZGHt0/dQSg==}
     peerDependencies:
       msw: ^2.4.9
       vite: ^6.0.0 || ^7.0.0-0
@@ -3447,20 +3447,20 @@ packages:
       vite:
         optional: true
 
-  '@vitest/pretty-format@4.0.4':
-    resolution: {integrity: sha512-lHI2rbyrLVSd1TiHGJYyEtbOBo2SDndIsN3qY4o4xe2pBxoJLD6IICghNCvD7P+BFin6jeyHXiUICXqgl6vEaQ==}
+  '@vitest/pretty-format@4.0.8':
+    resolution: {integrity: sha512-qRrjdRkINi9DaZHAimV+8ia9Gq6LeGz2CgIEmMLz3sBDYV53EsnLZbJMR1q84z1HZCMsf7s0orDgZn7ScXsZKg==}
 
-  '@vitest/runner@4.0.4':
-    resolution: {integrity: sha512-99EDqiCkncCmvIZj3qJXBZbyoQ35ghOwVWNnQ5nj0Hnsv4Qm40HmrMJrceewjLVvsxV/JSU4qyx2CGcfMBmXJw==}
+  '@vitest/runner@4.0.8':
+    resolution: {integrity: sha512-mdY8Sf1gsM8hKJUQfiPT3pn1n8RF4QBcJYFslgWh41JTfrK1cbqY8whpGCFzBl45LN028g0njLCYm0d7XxSaQQ==}
 
-  '@vitest/snapshot@4.0.4':
-    resolution: {integrity: sha512-XICqf5Gi4648FGoBIeRgnHWSNDp+7R5tpclGosFaUUFzY6SfcpsfHNMnC7oDu/iOLBxYfxVzaQpylEvpgii3zw==}
+  '@vitest/snapshot@4.0.8':
+    resolution: {integrity: sha512-Nar9OTU03KGiubrIOFhcfHg8FYaRaNT+bh5VUlNz8stFhCZPNrJvmZkhsr1jtaYvuefYFwK2Hwrq026u4uPWCw==}
 
-  '@vitest/spy@4.0.4':
-    resolution: {integrity: sha512-G9L13AFyYECo40QG7E07EdYnZZYCKMTSp83p9W8Vwed0IyCG1GnpDLxObkx8uOGPXfDpdeVf24P1Yka8/q1s9g==}
+  '@vitest/spy@4.0.8':
+    resolution: {integrity: sha512-nvGVqUunyCgZH7kmo+Ord4WgZ7lN0sOULYXUOYuHr55dvg9YvMz3izfB189Pgp28w0vWFbEEfNc/c3VTrqrXeA==}
 
-  '@vitest/utils@4.0.4':
-    resolution: {integrity: sha512-4bJLmSvZLyVbNsYFRpPYdJViG9jZyRvMZ35IF4ymXbRZoS+ycYghmwTGiscTXduUg2lgKK7POWIyXJNute1hjw==}
+  '@vitest/utils@4.0.8':
+    resolution: {integrity: sha512-pdk2phO5NDvEFfUTxcTP8RFYjVj/kfLSPIN5ebP2Mu9kcIMeAQTbknqcFEyBcC4z2pJlJI9aS5UQjcYfhmKAow==}
 
   '@vue/compiler-core@3.4.37':
     resolution: {integrity: sha512-ZDDT/KiLKuCRXyzWecNzC5vTcubGz4LECAtfGPENpo0nrmqJHwuWtRLxk/Sb9RAKtR9iFflFycbkjkY+W/PZUQ==}
@@ -5695,8 +5695,8 @@ packages:
   hangul-js@0.2.6:
     resolution: {integrity: sha512-48axU8LgjCD30FEs66Xc04/8knxMwCMQw0f67l67rlttW7VXT3qRJgQeHmhiuGwWXGvSbk6YM0fhQlcjE1JFQA==}
 
-  happy-dom@20.0.2:
-    resolution: {integrity: sha512-pYOyu624+6HDbY+qkjILpQGnpvZOusItCk+rvF5/V+6NkcgTKnbOldpIy22tBnxoaLtlM9nXgoqAcW29/B7CIw==}
+  happy-dom@20.0.10:
+    resolution: {integrity: sha512-6umCCHcjQrhP5oXhrHQQvLB0bwb1UzHAHdsXy+FjtKoYjUhmNZsQL8NivwM1vDvNEChJabVrUYxUnp/ZdYmy2g==}
     engines: {node: '>=20.0.0'}
 
   hard-rejection@2.1.0:
@@ -6749,8 +6749,8 @@ packages:
     resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
     engines: {node: '>=12'}
 
-  magicast@0.3.5:
-    resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
+  magicast@0.5.1:
+    resolution: {integrity: sha512-xrHS24IxaLrvuo613F719wvOIv9xPHFWQHuvGUBmPnCA/3MQxKI3b+r7n1jAoDHmsbC5bRhTZYR77invLAxVnw==}
 
   make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
@@ -9569,18 +9569,18 @@ packages:
       yaml:
         optional: true
 
-  vitest@4.0.4:
-    resolution: {integrity: sha512-hV31h0/bGbtmDQc0KqaxsTO1v4ZQeF8ojDFuy4sZhFadwAqqvJA0LDw68QUocctI5EDpFMql/jVWKuPYHIf2Ew==}
+  vitest@4.0.8:
+    resolution: {integrity: sha512-urzu3NCEV0Qa0Y2PwvBtRgmNtxhj5t5ULw7cuKhIHh3OrkKTLlut0lnBOv9qe5OvbkMH2g38G7KPDCTpIytBVg==}
     engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@types/debug': ^4.1.12
       '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
-      '@vitest/browser-playwright': 4.0.4
-      '@vitest/browser-preview': 4.0.4
-      '@vitest/browser-webdriverio': 4.0.4
-      '@vitest/ui': 4.0.4
+      '@vitest/browser-playwright': 4.0.8
+      '@vitest/browser-preview': 4.0.8
+      '@vitest/browser-webdriverio': 4.0.8
+      '@vitest/ui': 4.0.8
       happy-dom: '*'
       jsdom: '*'
     peerDependenciesMeta:
@@ -11929,7 +11929,7 @@ snapshots:
 
   '@npmcli/fs@3.1.1':
     dependencies:
-      semver: 7.6.3
+      semver: 7.7.3
     optional: true
 
   '@npmcli/map-workspaces@3.0.6':
@@ -12902,7 +12902,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
-      debug: 4.4.1
+      debug: 4.4.3
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
@@ -12952,85 +12952,85 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitest/coverage-v8@4.0.4(vitest@4.0.4(@types/node@20.5.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
+  '@vitest/coverage-v8@4.0.8(vitest@4.0.8(@types/node@20.5.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
-      '@vitest/utils': 4.0.4
+      '@vitest/utils': 4.0.8
       ast-v8-to-istanbul: 0.3.8
       debug: 4.4.3
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
       istanbul-reports: 3.2.0
-      magicast: 0.3.5
+      magicast: 0.5.1
       std-env: 3.10.0
       tinyrainbow: 3.0.3
-      vitest: 4.0.4(@types/node@20.5.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+      vitest: 4.0.8(@types/node@20.5.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/coverage-v8@4.0.4(vitest@4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
+  '@vitest/coverage-v8@4.0.8(vitest@4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
-      '@vitest/utils': 4.0.4
+      '@vitest/utils': 4.0.8
       ast-v8-to-istanbul: 0.3.8
       debug: 4.4.3
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
       istanbul-reports: 3.2.0
-      magicast: 0.3.5
+      magicast: 0.5.1
       std-env: 3.10.0
       tinyrainbow: 3.0.3
-      vitest: 4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
+      vitest: 4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitest/expect@4.0.4':
+  '@vitest/expect@4.0.8':
     dependencies:
       '@standard-schema/spec': 1.0.0
       '@types/chai': 5.2.3
-      '@vitest/spy': 4.0.4
-      '@vitest/utils': 4.0.4
+      '@vitest/spy': 4.0.8
+      '@vitest/utils': 4.0.8
       chai: 6.2.0
       tinyrainbow: 3.0.3
 
-  '@vitest/mocker@4.0.4(vite@7.1.12(@types/node@20.5.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
+  '@vitest/mocker@4.0.8(vite@7.1.12(@types/node@20.5.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
     dependencies:
-      '@vitest/spy': 4.0.4
+      '@vitest/spy': 4.0.8
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
       vite: 7.1.12(@types/node@20.5.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
-  '@vitest/mocker@4.0.4(vite@7.1.12(@types/node@24.9.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
+  '@vitest/mocker@4.0.8(vite@7.1.12(@types/node@24.9.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))':
     dependencies:
-      '@vitest/spy': 4.0.4
+      '@vitest/spy': 4.0.8
       estree-walker: 3.0.3
       magic-string: 0.30.21
     optionalDependencies:
       vite: 7.1.12(@types/node@24.9.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1)
 
-  '@vitest/pretty-format@4.0.4':
+  '@vitest/pretty-format@4.0.8':
     dependencies:
       tinyrainbow: 3.0.3
 
-  '@vitest/runner@4.0.4':
+  '@vitest/runner@4.0.8':
     dependencies:
-      '@vitest/utils': 4.0.4
+      '@vitest/utils': 4.0.8
       pathe: 2.0.3
 
-  '@vitest/snapshot@4.0.4':
+  '@vitest/snapshot@4.0.8':
     dependencies:
-      '@vitest/pretty-format': 4.0.4
+      '@vitest/pretty-format': 4.0.8
       magic-string: 0.30.21
       pathe: 2.0.3
 
-  '@vitest/spy@4.0.4': {}
+  '@vitest/spy@4.0.8': {}
 
-  '@vitest/utils@4.0.4':
+  '@vitest/utils@4.0.8':
     dependencies:
-      '@vitest/pretty-format': 4.0.4
+      '@vitest/pretty-format': 4.0.8
       tinyrainbow: 3.0.3
 
   '@vue/compiler-core@3.4.37':
@@ -14444,7 +14444,7 @@ snapshots:
 
   docker-modem@5.0.6:
     dependencies:
-      debug: 4.4.1
+      debug: 4.4.3
       readable-stream: 3.6.2
       split-ca: 1.0.1
       ssh2: 1.16.0
@@ -15951,7 +15951,7 @@ snapshots:
 
   hangul-js@0.2.6: {}
 
-  happy-dom@20.0.2:
+  happy-dom@20.0.10:
     dependencies:
       '@types/node': 20.14.11
       '@types/whatwg-mimetype': 3.0.2
@@ -17028,7 +17028,7 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  magicast@0.3.5:
+  magicast@0.5.1:
     dependencies:
       '@babel/parser': 7.28.5
       '@babel/types': 7.28.5
@@ -17717,7 +17717,7 @@ snapshots:
       make-fetch-happen: 13.0.1
       nopt: 7.2.1
       proc-log: 4.2.0
-      semver: 7.6.3
+      semver: 7.7.3
       tar: 6.2.1
       which: 4.0.0
     transitivePeerDependencies:
@@ -20330,15 +20330,15 @@ snapshots:
       tsx: 4.16.2
       yaml: 2.8.1
 
-  vitest@4.0.4(@types/node@20.5.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1):
+  vitest@4.0.8(@types/node@20.5.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1):
     dependencies:
-      '@vitest/expect': 4.0.4
-      '@vitest/mocker': 4.0.4(vite@7.1.12(@types/node@20.5.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
-      '@vitest/pretty-format': 4.0.4
-      '@vitest/runner': 4.0.4
-      '@vitest/snapshot': 4.0.4
-      '@vitest/spy': 4.0.4
-      '@vitest/utils': 4.0.4
+      '@vitest/expect': 4.0.8
+      '@vitest/mocker': 4.0.8(vite@7.1.12(@types/node@20.5.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
+      '@vitest/pretty-format': 4.0.8
+      '@vitest/runner': 4.0.8
+      '@vitest/snapshot': 4.0.8
+      '@vitest/spy': 4.0.8
+      '@vitest/utils': 4.0.8
       debug: 4.4.3
       es-module-lexer: 1.7.0
       expect-type: 1.2.2
@@ -20354,7 +20354,7 @@ snapshots:
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 20.5.1
-      happy-dom: 20.0.2
+      happy-dom: 20.0.10
     transitivePeerDependencies:
       - jiti
       - less
@@ -20369,15 +20369,15 @@ snapshots:
       - tsx
       - yaml
 
-  vitest@4.0.4(@types/node@24.9.1)(happy-dom@20.0.2)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1):
+  vitest@4.0.8(@types/node@24.9.1)(happy-dom@20.0.10)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1):
     dependencies:
-      '@vitest/expect': 4.0.4
-      '@vitest/mocker': 4.0.4(vite@7.1.12(@types/node@24.9.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
-      '@vitest/pretty-format': 4.0.4
-      '@vitest/runner': 4.0.4
-      '@vitest/snapshot': 4.0.4
-      '@vitest/spy': 4.0.4
-      '@vitest/utils': 4.0.4
+      '@vitest/expect': 4.0.8
+      '@vitest/mocker': 4.0.8(vite@7.1.12(@types/node@24.9.1)(sass@1.70.0)(terser@5.44.0)(tsx@4.16.2)(yaml@2.8.1))
+      '@vitest/pretty-format': 4.0.8
+      '@vitest/runner': 4.0.8
+      '@vitest/snapshot': 4.0.8
+      '@vitest/spy': 4.0.8
+      '@vitest/utils': 4.0.8
       debug: 4.4.3
       es-module-lexer: 1.7.0
       expect-type: 1.2.2
@@ -20393,7 +20393,7 @@ snapshots:
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 24.9.1
-      happy-dom: 20.0.2
+      happy-dom: 20.0.10
     transitivePeerDependencies:
       - jiti
       - less