diff --git a/src/main/updater.test.ts b/src/main/updater.test.ts
index 7c460aa09..fc858ff48 100644
--- a/src/main/updater.test.ts
+++ b/src/main/updater.test.ts
@@ -205,12 +205,12 @@ describe('main/updater.ts', () => {
     });
 
     it('performs initial check and schedules periodic checks', async () => {
-      const originalSetInterval = global.setInterval;
+      const originalSetInterval = globalThis.setInterval;
       const setIntervalSpy = jest
-        .spyOn(global, 'setInterval')
+        .spyOn(globalThis, 'setInterval')
         .mockImplementation(((fn: () => void) => {
           fn();
-          return 0 as unknown as NodeJS.Timer;
+          return 0 as unknown as NodeJS.Timeout;
         }) as unknown as typeof setInterval);
       try {
         await updater.start();
@@ -224,7 +224,7 @@ describe('main/updater.ts', () => {
         );
       } finally {
         setIntervalSpy.mockRestore();
-        global.setInterval = originalSetInterval;
+        globalThis.setInterval = originalSetInterval;
       }
     });
   });
diff --git a/src/renderer/__helpers__/test-utils.tsx b/src/renderer/__helpers__/test-utils.tsx
new file mode 100644
index 000000000..f26f9223f
--- /dev/null
+++ b/src/renderer/__helpers__/test-utils.tsx
@@ -0,0 +1,76 @@
+import { render } from '@testing-library/react';
+import type { ReactElement, ReactNode } from 'react';
+import { useMemo } from 'react';
+
+import { BaseStyles, ThemeProvider } from '@primer/react';
+
+import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
+import type { AppContextState } from '../context/App';
+import { AppContext } from '../context/App';
+
+/**
+ * Props for the AppContextProvider wrapper
+ */
+interface AppContextProviderProps {
+  readonly children: ReactNode;
+  readonly value?: Partial<AppContextState>;
+}
+
+/**
+ * Wrapper component that provides ThemeProvider, BaseStyles, and AppContext
+ * with sensible defaults for testing.
+ */
+export function AppContextProvider({
+  children,
+  value = {},
+}: AppContextProviderProps) {
+  const defaultValue: Partial<AppContextState> = useMemo(() => {
+    return {
+      auth: mockAuth,
+      settings: mockSettings,
+
+      notifications: [],
+
+      status: 'success',
+      globalError: null,
+
+      ...value,
+    } as Partial<AppContextState>;
+  }, [value]);
+
+  return (
+    <ThemeProvider>
+      <BaseStyles>
+        <AppContext.Provider value={defaultValue}>
+          {children}
+        </AppContext.Provider>
+      </BaseStyles>
+    </ThemeProvider>
+  );
+}
+
+/**
+ * Custom render that wraps components with AppContextProvider by default.
+ *
+ * Usage:
+ *   renderWithAppContext(<MyComponent />, { auth, settings, ... })
+ */
+export function renderWithAppContext(
+  ui: ReactElement,
+  context: Partial<AppContextState> = {},
+) {
+  const value: Partial<AppContextState> = { ...context };
+
+  return render(ui, {
+    wrapper: ({ children }) => (
+      <AppContextProvider value={value}>{children}</AppContextProvider>
+    ),
+  });
+}
+
+/**
+ * Ensure stable snapshots for our randomized emoji use-cases
+ */
+export function ensureStableEmojis() {
+  global.Math.random = jest.fn(() => 0.1);
+}
diff --git a/src/renderer/__mocks__/account-mocks.ts b/src/renderer/__mocks__/account-mocks.ts
new file mode 100644
index 000000000..5e104f4ca
--- /dev/null
+++ b/src/renderer/__mocks__/account-mocks.ts
@@ -0,0 +1,63 @@
+import { Constants } from '../constants';
+import type {
+  Account,
+  AccountNotifications,
+  GitifyError,
+  Hostname,
+  Token,
+} from '../types';
+import { mockGitifyUser } from './user-mocks';
+
+export const mockPersonalAccessTokenAccount: Account = {
+  platform: 'GitHub Cloud',
+  method: 'Personal Access Token',
+  token: 'token-123-456' as Token,
+  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+  user: mockGitifyUser,
+  hasRequiredScopes: true,
+};
+
+export const mockOAuthAccount: Account = {
+  platform: 'GitHub Enterprise Server',
+  method: 'OAuth App',
+  token: '1234568790' as Token,
+  hostname: 'github.gitify.io' as Hostname,
+  user: mockGitifyUser,
+  hasRequiredScopes: true,
+};
+
+export const mockGitHubCloudAccount: Account = {
+  platform: 'GitHub Cloud',
+  method: 'Personal Access Token',
+  token: 'token-123-456' as Token,
+  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+  user: mockGitifyUser,
+  version: 'latest',
+  hasRequiredScopes: true,
+};
+
+export const mockGitHubEnterpriseServerAccount: Account = {
+  platform: 'GitHub Enterprise Server',
+  method: 'Personal Access Token',
+  token: '1234568790' as Token,
+  hostname: 'github.gitify.io' as Hostname,
+  user: mockGitifyUser,
+  hasRequiredScopes: true,
+};
+
+export const mockGitHubAppAccount: Account = {
+  platform: 'GitHub Cloud',
+  method: 'GitHub App',
+  token: '987654321' as Token,
+  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
+  user: mockGitifyUser,
+  hasRequiredScopes: true,
+};
+
+export function mockAccountWithError(error: GitifyError): AccountNotifications {
+  return {
+    account: mockGitHubCloudAccount,
+    notifications: [],
+    error,
+  };
+}
diff --git a/src/renderer/__mocks__/notifications-mocks.ts b/src/renderer/__mocks__/notifications-mocks.ts
index f4dadb94b..7b678e777 100644
--- a/src/renderer/__mocks__/notifications-mocks.ts
+++ b/src/renderer/__mocks__/notifications-mocks.ts
@@ -1,6 +1,8 @@
-import type { AccountNotifications, GitifyError } from '../types';
+import { Constants } from '../constants';
+import type { AccountNotifications, Hostname } from '../types';
 import type {
   Notification,
+  Repository,
   StateType,
   Subject,
   SubjectType,
@@ -13,30 +15,11 @@ import {
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
-} from './state-mocks';
+} from './account-mocks';
+import { mockToken } from './state-mocks';
+import { mockGitifyUser } from './user-mocks';
 
-export const mockAccountNotifications: AccountNotifications[] = [
-  {
-    account: mockGitHubCloudAccount,
-    notifications: mockGitHubNotifications,
-    error: null,
-  },
-  {
-    account: mockGitHubEnterpriseServerAccount,
-    notifications: mockEnterpriseNotifications,
-    error: null,
-  },
-];
-
-export const mockSingleAccountNotifications: AccountNotifications[] = [
-  {
-    account: mockGitHubCloudAccount,
-    notifications: [mockSingleNotification],
-    error: null,
-  },
-];
-
-export function createSubjectMock(mocks: {
+export function createMockSubject(mocks: {
   title?: string;
   type?: SubjectType;
   state?: StateType;
@@ -50,12 +33,24 @@ export function createSubjectMock(mocks: {
   };
 }
 
-export function mockAccountWithError(error: GitifyError): AccountNotifications {
-  return {
-    account: mockGitHubCloudAccount,
-    notifications: [],
-    error,
+export function createPartialMockNotification(
+  subject: Partial<Subject>,
+  repository?: Partial<Repository>,
+): Notification {
+  const mockNotification: Partial<Notification> = {
+    account: {
+      method: 'Personal Access Token',
+      platform: 'GitHub Cloud',
+      hostname: Constants.GITHUB_API_BASE_URL as Hostname,
+      token: mockToken,
+      user: mockGitifyUser,
+      hasRequiredScopes: true,
+    },
+    subject: subject as Subject,
+    repository: repository as Repository,
   };
+
+  return mockNotification as Notification;
 }
 
 export function createMockNotificationForRepoName(
@@ -68,3 +63,24 @@ export function createMockNotificationForRepoName(
     account: mockGitHubCloudAccount,
   } as Notification;
 }
+
+export const mockAccountNotifications: AccountNotifications[] = [
+  {
+    account: mockGitHubCloudAccount,
+    notifications: mockGitHubNotifications,
+    error: null,
+  },
+  {
+    account: mockGitHubEnterpriseServerAccount,
+    notifications: mockEnterpriseNotifications,
+    error: null,
+  },
+];
+
+export const mockSingleAccountNotifications: AccountNotifications[] = [
+  {
+    account: mockGitHubCloudAccount,
+    notifications: [mockSingleNotification],
+    error: null,
+  },
+];
diff --git a/src/renderer/__mocks__/partial-mocks.ts b/src/renderer/__mocks__/partial-mocks.ts
deleted file mode 100644
index d40b01e73..000000000
--- a/src/renderer/__mocks__/partial-mocks.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Constants } from '../constants';
-import type { Hostname, Link } from '../types';
-import type { Notification, Repository, Subject, User } from '../typesGitHub';
-import { mockGitifyUser, mockToken } from './state-mocks';
-
-export function partialMockNotification(
-  subject: Partial<Subject>,
-  repository?: Partial<Repository>,
-): Notification {
-  const mockNotification: Partial<Notification> = {
-    account: {
-      method: 'Personal Access Token',
-      platform: 'GitHub Cloud',
-      hostname: Constants.GITHUB_API_BASE_URL as Hostname,
-      token: mockToken,
-      user: mockGitifyUser,
-      hasRequiredScopes: true,
-    },
-    subject: subject as Subject,
-    repository: repository as Repository,
-  };
-
-  return mockNotification as Notification;
-}
-
-export function partialMockUser(login: string): User {
-  const mockUser: Partial<User> = {
-    login: login,
-    html_url: `https://github.com/${login}` as Link,
-    avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
-    type: 'User',
-  };
-
-  return mockUser as User;
-}
diff --git a/src/renderer/__mocks__/state-mocks.ts b/src/renderer/__mocks__/state-mocks.ts
index 5dcf04044..63ad1f1c0 100644
--- a/src/renderer/__mocks__/state-mocks.ts
+++ b/src/renderer/__mocks__/state-mocks.ts
@@ -1,15 +1,11 @@
 import { Constants } from '../constants';
 import {
-  type Account,
   type AppearanceSettingsState,
   type AuthState,
   FetchType,
   type FilterSettingsState,
   type GitifyState,
-  type GitifyUser,
   GroupBy,
-  type Hostname,
-  type Link,
   type NotificationSettingsState,
   OpenPreference,
   type Percentage,
@@ -19,59 +15,10 @@ import {
   type Token,
   type TraySettingsState,
 } from '../types';
-
-export const mockGitifyUser: GitifyUser = {
-  login: 'octocat',
-  name: 'Mona Lisa Octocat',
-  id: 123456789,
-  avatar: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
-};
-
-export const mockPersonalAccessTokenAccount: Account = {
-  platform: 'GitHub Cloud',
-  method: 'Personal Access Token',
-  token: 'token-123-456' as Token,
-  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
-  user: mockGitifyUser,
-  hasRequiredScopes: true,
-};
-
-export const mockOAuthAccount: Account = {
-  platform: 'GitHub Enterprise Server',
-  method: 'OAuth App',
-  token: '1234568790' as Token,
-  hostname: 'github.gitify.io' as Hostname,
-  user: mockGitifyUser,
-  hasRequiredScopes: true,
-};
-
-export const mockGitHubCloudAccount: Account = {
-  platform: 'GitHub Cloud',
-  method: 'Personal Access Token',
-  token: 'token-123-456' as Token,
-  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
-  user: mockGitifyUser,
-  version: 'latest',
-  hasRequiredScopes: true,
-};
-
-export const mockGitHubEnterpriseServerAccount: Account = {
-  platform: 'GitHub Enterprise Server',
-  method: 'Personal Access Token',
-  token: '1234568790' as Token,
-  hostname: 'github.gitify.io' as Hostname,
-  user: mockGitifyUser,
-  hasRequiredScopes: true,
-};
-
-export const mockGitHubAppAccount: Account = {
-  platform: 'GitHub Cloud',
-  method: 'GitHub App',
-  token: '987654321' as Token,
-  hostname: Constants.DEFAULT_AUTH_OPTIONS.hostname,
-  user: mockGitifyUser,
-  hasRequiredScopes: true,
-};
+import {
+  mockGitHubCloudAccount,
+  mockGitHubEnterpriseServerAccount,
+} from './account-mocks';
 
 export const mockAuth: AuthState = {
   accounts: [mockGitHubCloudAccount, mockGitHubEnterpriseServerAccount],
diff --git a/src/renderer/__mocks__/user-mocks.ts b/src/renderer/__mocks__/user-mocks.ts
new file mode 100644
index 000000000..3cb316d3d
--- /dev/null
+++ b/src/renderer/__mocks__/user-mocks.ts
@@ -0,0 +1,20 @@
+import type { GitifyUser, Link } from '../types';
+import type { User } from '../typesGitHub';
+
+export const mockGitifyUser: GitifyUser = {
+  login: 'octocat',
+  name: 'Mona Lisa Octocat',
+  id: 123456789,
+  avatar: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
+};
+
+export function createPartialMockUser(login: string): User {
+  const mockUser: Partial<User> = {
+    login: login,
+    html_url: `https://github.com/${login}` as Link,
+    avatar_url: 'https://avatars.githubusercontent.com/u/583231?v=4' as Link,
+    type: 'User',
+  };
+
+  return mockUser as User;
+}
diff --git a/src/renderer/__mocks__/utils.ts b/src/renderer/__mocks__/utils.ts
deleted file mode 100644
index 2b832d466..000000000
--- a/src/renderer/__mocks__/utils.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Ensure stable snapshots for our randomized emoji use-cases
- */
-export function ensureStableEmojis() {
-  global.Math.random = jest.fn(() => 0.1);
-}
diff --git a/src/renderer/components/AllRead.test.tsx b/src/renderer/components/AllRead.test.tsx
index 743e4d6cf..c8f07fbf9 100644
--- a/src/renderer/components/AllRead.test.tsx
+++ b/src/renderer/components/AllRead.test.tsx
@@ -1,8 +1,10 @@
-import { act, render } from '@testing-library/react';
+import { act } from '@testing-library/react';
 
+import {
+  ensureStableEmojis,
+  renderWithAppContext,
+} from '../__helpers__/test-utils';
 import { mockSettings } from '../__mocks__/state-mocks';
-import { ensureStableEmojis } from '../__mocks__/utils';
-import { AppContext } from '../context/App';
 import { AllRead } from './AllRead';
 
 describe('renderer/components/AllRead.tsx', () => {
@@ -11,41 +13,29 @@ describe('renderer/components/AllRead.tsx', () => {
   });
 
   it('should render itself & its children - no filters', async () => {
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-            },
-          }}
-        >
-          <AllRead />
-        </AppContext.Provider>,
-      );
+      tree = renderWithAppContext(<AllRead />, {
+        settings: {
+          ...mockSettings,
+        },
+      });
     });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - with filters', async () => {
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              filterReasons: ['author'],
-            },
-          }}
-        >
-          <AllRead />
-        </AppContext.Provider>,
-      );
+      tree = renderWithAppContext(<AllRead />, {
+        settings: {
+          ...mockSettings,
+          filterReasons: ['author'],
+        },
+      });
     });
 
     expect(tree).toMatchSnapshot();
diff --git a/src/renderer/components/Oops.test.tsx b/src/renderer/components/Oops.test.tsx
index 9eb16be2f..d2fc67a00 100644
--- a/src/renderer/components/Oops.test.tsx
+++ b/src/renderer/components/Oops.test.tsx
@@ -1,6 +1,9 @@
-import { act, render } from '@testing-library/react';
+import { act } from '@testing-library/react';
 
-import { ensureStableEmojis } from '../__mocks__/utils';
+import {
+  ensureStableEmojis,
+  renderWithAppContext,
+} from '../__helpers__/test-utils';
 import { Oops } from './Oops';
 
 describe('renderer/components/Oops.tsx', () => {
@@ -15,20 +18,20 @@ describe('renderer/components/Oops.tsx', () => {
       emojis: ['🔥'],
     };
 
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(<Oops error={mockError} />);
+      tree = renderWithAppContext(<Oops error={mockError} />);
     });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - fallback to unknown error', async () => {
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(<Oops error={null} />);
+      tree = renderWithAppContext(<Oops error={null} />);
     });
 
     expect(tree).toMatchSnapshot();
diff --git a/src/renderer/components/Sidebar.test.tsx b/src/renderer/components/Sidebar.test.tsx
index 55c7186bf..93626c1e5 100644
--- a/src/renderer/components/Sidebar.test.tsx
+++ b/src/renderer/components/Sidebar.test.tsx
@@ -1,10 +1,9 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MemoryRouter } from 'react-router-dom';
 
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import { mockAccountNotifications } from '../__mocks__/notifications-mocks';
-import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
-import { AppContext } from '../context/App';
 import * as comms from '../utils/comms';
 import { Sidebar } from './Sidebar';
 
@@ -15,8 +14,8 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('renderer/components/Sidebar.tsx', () => {
-  const fetchNotifications = jest.fn();
-  const openExternalLinkMock = jest
+  const mockFetchNotifications = jest.fn();
+  const mockOpenExternalLink = jest
     .spyOn(comms, 'openExternalLink')
     .mockImplementation();
 
@@ -25,56 +24,39 @@ describe('renderer/components/Sidebar.tsx', () => {
   });
 
   it('should render itself & its children (logged in)', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          notifications: mockAccountNotifications,
-          auth: mockAuth,
-          settings: mockSettings,
-        }}
-      >
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <MemoryRouter>
+        <Sidebar />
+      </MemoryRouter>,
+      {
+        isLoggedIn: true,
+      },
     );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children (logged out)', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          isLoggedIn: false,
-          notifications: mockAccountNotifications,
-          auth: mockAuth,
-          settings: mockSettings,
-        }}
-      >
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <MemoryRouter>
+        <Sidebar />
+      </MemoryRouter>,
+      {
+        isLoggedIn: false,
+      },
     );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should navigate home when clicking the gitify logo', async () => {
-    render(
-      <AppContext.Provider
-        value={{
-          isLoggedIn: false,
-          notifications: [],
-          auth: mockAuth,
-          settings: mockSettings,
-        }}
-      >
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>
-      </AppContext.Provider>,
+    renderWithAppContext(
+      <MemoryRouter>
+        <Sidebar />
+      </MemoryRouter>,
+      {
+        isLoggedIn: false,
+      },
     );
 
     await userEvent.click(screen.getByTestId('sidebar-home'));
@@ -84,62 +66,46 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('notifications icon', () => {
     it('opens notifications home when clicked', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-notifications'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/notifications',
       );
     });
 
     it('renders correct icon when there are no notifications', () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          notifications: [],
+        },
       );
 
       expect(screen.getByTestId('sidebar-notifications')).toMatchSnapshot();
     });
 
     it('renders correct icon when there are notifications', () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          notifications: mockAccountNotifications,
+        },
       );
 
       expect(screen.getByTestId('sidebar-notifications')).toMatchSnapshot();
@@ -148,19 +114,13 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Filter notifications', () => {
     it('go to the filters route', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
@@ -169,19 +129,13 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('go to the home if filters path already shown', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter initialEntries={['/filters']}>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/filters']}>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-filter-notifications'));
@@ -192,49 +146,39 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('quick links', () => {
     it('opens my github issues page', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: mockAccountNotifications,
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          notifications: mockAccountNotifications,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-my-issues'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/issues',
       );
     });
 
     it('opens my github pull requests page', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: mockAccountNotifications,
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          notifications: mockAccountNotifications,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-my-pull-requests'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/pulls',
       );
     });
@@ -242,67 +186,51 @@ describe('renderer/components/Sidebar.tsx', () => {
 
   describe('Refresh Notifications', () => {
     it('should refresh the notifications when status is not loading', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-            fetchNotifications,
-            status: 'success',
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          notifications: [],
+          fetchNotifications: mockFetchNotifications,
+          status: 'success',
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-refresh'));
 
-      expect(fetchNotifications).toHaveBeenCalledTimes(1);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(1);
     });
 
     it('should not refresh the notifications when status is loading', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-            fetchNotifications,
-            status: 'loading',
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          notifications: [],
+          fetchNotifications: mockFetchNotifications,
+          status: 'loading',
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-refresh'));
 
-      expect(fetchNotifications).not.toHaveBeenCalled();
+      expect(mockFetchNotifications).not.toHaveBeenCalled();
     });
   });
 
   describe('Settings', () => {
     it('go to the settings route', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <MemoryRouter>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-settings'));
@@ -311,49 +239,37 @@ describe('renderer/components/Sidebar.tsx', () => {
     });
 
     it('go to the home if settings path already shown', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            isLoggedIn: true,
-            notifications: [],
-            auth: mockAuth,
-            settings: mockSettings,
-            fetchNotifications,
-          }}
-        >
-          <MemoryRouter initialEntries={['/settings']}>
-            <Sidebar />
-          </MemoryRouter>
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <MemoryRouter initialEntries={['/settings']}>
+          <Sidebar />
+        </MemoryRouter>,
+        {
+          isLoggedIn: true,
+          fetchNotifications: mockFetchNotifications,
+        },
       );
 
       await userEvent.click(screen.getByTestId('sidebar-settings'));
 
-      expect(fetchNotifications).toHaveBeenCalledTimes(1);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(1);
       expect(mockNavigate).toHaveBeenNthCalledWith(1, '/', { replace: true });
     });
   });
 
   it('should quit the app', async () => {
-    const quitAppMock = jest.spyOn(comms, 'quitApp');
-
-    render(
-      <AppContext.Provider
-        value={{
-          isLoggedIn: false,
-          notifications: [],
-          auth: mockAuth,
-          settings: mockSettings,
-        }}
-      >
-        <MemoryRouter>
-          <Sidebar />
-        </MemoryRouter>
-      </AppContext.Provider>,
+    const mockQuitApp = jest.spyOn(comms, 'quitApp');
+
+    renderWithAppContext(
+      <MemoryRouter>
+        <Sidebar />
+      </MemoryRouter>,
+      {
+        isLoggedIn: false,
+      },
     );
 
     await userEvent.click(screen.getByTestId('sidebar-quit'));
 
-    expect(quitAppMock).toHaveBeenCalledTimes(1);
+    expect(mockQuitApp).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/renderer/components/__snapshots__/AllRead.test.tsx.snap b/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
index 2680d7bb3..7fb910ac5 100644
--- a/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/AllRead.test.tsx.snap
@@ -6,45 +6,56 @@ exports[`renderer/components/AllRead.tsx should render itself & its children - n
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
             <div
-              class="text-7xl"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <img
-                alt="🎊"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f38a.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              No new  notifications
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🎊"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f38a.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  No new  notifications
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -53,45 +64,56 @@ exports[`renderer/components/AllRead.tsx should render itself & its children - n
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🎊"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f38a.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            No new  notifications
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🎊"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f38a.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                No new  notifications
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -157,45 +179,56 @@ exports[`renderer/components/AllRead.tsx should render itself & its children - w
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
             <div
-              class="text-7xl"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <img
-                alt="🎊"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f38a.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              No new filtered  notifications
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🎊"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f38a.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  No new filtered  notifications
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -204,45 +237,56 @@ exports[`renderer/components/AllRead.tsx should render itself & its children - w
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🎊"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f38a.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            No new filtered  notifications
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🎊"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f38a.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                No new filtered  notifications
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/renderer/components/__snapshots__/Oops.test.tsx.snap b/src/renderer/components/__snapshots__/Oops.test.tsx.snap
index 73af1dc40..e4a068b56 100644
--- a/src/renderer/components/__snapshots__/Oops.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Oops.test.tsx.snap
@@ -6,51 +6,62 @@ exports[`renderer/components/Oops.tsx should render itself & its children - fall
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
             <div
-              class="text-7xl"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <img
-                alt="🤔"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f914.svg"
-              />
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🤔"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f914.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  Oops! Something went wrong
+                </div>
+              </div>
+              <div
+                class="text-center"
+              >
+                Please try again later.
+              </div>
             </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Oops! Something went wrong
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Please try again later.
           </div>
         </div>
       </div>
@@ -58,52 +69,63 @@ exports[`renderer/components/Oops.tsx should render itself & its children - fall
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🤔"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f914.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            Oops! Something went wrong
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🤔"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f914.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                Oops! Something went wrong
+              </div>
+            </div>
+            <div
+              class="text-center"
+            >
+              Please try again later.
+            </div>
           </div>
         </div>
-        <div
-          class="text-center"
-        >
-          Please try again later.
-        </div>
       </div>
     </div>
   </div>,
@@ -167,51 +189,62 @@ exports[`renderer/components/Oops.tsx should render itself & its children - spec
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
             <div
-              class="text-7xl"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <img
-                alt="🔥"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f525.svg"
-              />
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🔥"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f525.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  Error title
+                </div>
+              </div>
+              <div
+                class="text-center"
+              >
+                Error description
+              </div>
             </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Error title
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Error description
           </div>
         </div>
       </div>
@@ -219,52 +252,63 @@ exports[`renderer/components/Oops.tsx should render itself & its children - spec
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🔥"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f525.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            Error title
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🔥"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f525.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                Error title
+              </div>
+            </div>
+            <div
+              class="text-center"
+            >
+              Error description
+            </div>
           </div>
         </div>
-        <div
-          class="text-center"
-        >
-          Error description
-        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
index 69431d354..7e2af5527 100644
--- a/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
+++ b/src/renderer/components/__snapshots__/Sidebar.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renderer/components/Sidebar.tsx notifications icon renders correct icon when there are no notifications 1`] = `
 <button
-  aria-describedby="_r_1f_-loading-announcement _r_1e_"
+  aria-describedby="_r_1o_-loading-announcement _r_1n_"
   aria-label="Notifications"
   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
   data-component="IconButton"
@@ -34,7 +34,7 @@ exports[`renderer/components/Sidebar.tsx notifications icon renders correct icon
 
 exports[`renderer/components/Sidebar.tsx notifications icon renders correct icon when there are notifications 1`] = `
 <button
-  aria-describedby="_r_1t_-loading-announcement _r_1s_"
+  aria-describedby="_r_27_-loading-announcement _r_26_"
   aria-label="Notifications"
   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
   data-component="IconButton"
@@ -70,510 +70,696 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
   "baseElement": <body>
     <div>
       <div
-        class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="space-between"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            aria-describedby="_r_1_-loading-announcement _r_0_"
-            aria-label="Gitify"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-home"
-            data-variant="invisible"
-            type="button"
+          <div
+            class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="vertical"
+            data-justify="space-between"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              aria-label="Gitify Logo"
-              class="size-5"
-              viewBox="0 0 500 500"
-              xmlns="https://www.w3.org/2000/svg"
-              xmlns:xlink="https://www.w3.org/1999/xlink"
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="normal"
+              data-wrap="nowrap"
             >
-              <defs>
-                <lineargradient
-                  id="linearGradient-light"
-                  x1="90.8779989%"
-                  x2="-1.30249747%"
-                  y1="80.0676288%"
-                  y2="32.7108237%"
+              <button
+                aria-describedby="_r_2_-loading-announcement _r_1_"
+                aria-label="Gitify"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-home"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  aria-label="Gitify Logo"
+                  class="size-5"
+                  viewBox="0 0 500 500"
+                  xmlns="https://www.w3.org/2000/svg"
+                  xmlns:xlink="https://www.w3.org/1999/xlink"
+                >
+                  <defs>
+                    <lineargradient
+                      id="linearGradient-light"
+                      x1="90.8779989%"
+                      x2="-1.30249747%"
+                      y1="80.0676288%"
+                      y2="32.7108237%"
+                    >
+                      <stop
+                        offset="0%"
+                        stop-color="#CCCCCC"
+                      />
+                      <stop
+                        offset="100%"
+                        stop-color="#FFFFFF"
+                      />
+                    </lineargradient>
+                  </defs>
+                  <g
+                    fill="none"
+                    fill-rule="evenodd"
+                    stroke="none"
+                    stroke-width="1"
+                  >
+                    <g
+                      fill="url(#linearGradient-light)"
+                      fill-rule="nonzero"
+                      id="Logo"
+                      transform="translate(6.000000, 6.000000)"
+                    >
+                      <path
+                        d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                      />
+                    </g>
+                  </g>
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_1_"
+                popover="auto"
+                role="tooltip"
+              >
+                Home
+              </span>
+              <button
+                aria-describedby="_r_4_-loading-announcement _r_3_"
+                aria-label="Notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-notifications"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <stop
-                    offset="0%"
-                    stop-color="#CCCCCC"
+                  <path
+                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
                   />
-                  <stop
-                    offset="100%"
-                    stop-color="#FFFFFF"
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_3_"
+                popover="auto"
+                role="tooltip"
+              >
+                undefined unread notifications ↗
+              </span>
+              <button
+                aria-describedby="_r_6_-loading-announcement _r_5_"
+                aria-label="Filters"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-filter-notifications"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-filter"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"
                   />
-                </lineargradient>
-              </defs>
-              <g
-                fill="none"
-                fill-rule="evenodd"
-                stroke="none"
-                stroke-width="1"
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_5_"
+                popover="auto"
+                role="tooltip"
               >
-                <g
-                  fill="url(#linearGradient-light)"
-                  fill-rule="nonzero"
-                  id="Logo"
-                  transform="translate(6.000000, 6.000000)"
+                Filter notifications
+              </span>
+              <button
+                aria-describedby="_r_8_-loading-announcement"
+                aria-labelledby="_r_7_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-my-issues"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
                   <path
-                    d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
-                </g>
-              </g>
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_0_"
-            popover="auto"
-            role="tooltip"
-          >
-            Home
-          </span>
-          <button
-            aria-describedby="_r_3_-loading-announcement _r_2_"
-            aria-label="Notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-notifications"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_2_"
-            popover="auto"
-            role="tooltip"
-          >
-            undefined unread notifications ↗
-          </span>
-          <button
-            aria-describedby="_r_5_-loading-announcement"
-            aria-labelledby="_r_4_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-my-issues"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_4_"
-            popover="auto"
-          >
-            My issues ↗
-          </span>
-          <button
-            aria-describedby="_r_7_-loading-announcement"
-            aria-labelledby="_r_6_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-my-pull-requests"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_6_"
-            popover="auto"
-          >
-            My pull requests ↗
-          </span>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_9_-loading-announcement"
-            aria-labelledby="_r_8_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-quit"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-x-circle"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_7_"
+                popover="auto"
+              >
+                My issues ↗
+              </span>
+              <button
+                aria-describedby="_r_a_-loading-announcement"
+                aria-labelledby="_r_9_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-my-pull-requests"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_9_"
+                popover="auto"
+              >
+                My pull requests ↗
+              </span>
+            </div>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="normal"
+              data-wrap="nowrap"
             >
-              <path
-                d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_8_"
-            popover="auto"
-          >
-            Quit Gitify
-          </span>
+              <div
+                data-loading-wrapper="true"
+              >
+                <button
+                  aria-describedby="_r_c_-loading-announcement _r_b_"
+                  aria-label="Refresh"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="small"
+                  data-testid="sidebar-refresh"
+                  data-variant="invisible"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-sync"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
+                    />
+                  </svg>
+                </button>
+              </div>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_b_"
+                popover="auto"
+                role="tooltip"
+              >
+                Refresh notifications
+              </span>
+              <button
+                aria-describedby="_r_e_-loading-announcement"
+                aria-labelledby="_r_d_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-settings"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-gear"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_d_"
+                popover="auto"
+              >
+                Settings
+              </span>
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="vertical"
-      data-justify="space-between"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="normal"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_1_-loading-announcement _r_0_"
-          aria-label="Gitify"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-home"
-          data-variant="invisible"
-          type="button"
+        <div
+          class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
+          data-align="stretch"
+          data-direction="vertical"
+          data-justify="space-between"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <svg
-            aria-hidden="true"
-            aria-label="Gitify Logo"
-            class="size-5"
-            viewBox="0 0 500 500"
-            xmlns="https://www.w3.org/2000/svg"
-            xmlns:xlink="https://www.w3.org/1999/xlink"
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="normal"
+            data-wrap="nowrap"
           >
-            <defs>
-              <lineargradient
-                id="linearGradient-light"
-                x1="90.8779989%"
-                x2="-1.30249747%"
-                y1="80.0676288%"
-                y2="32.7108237%"
+            <button
+              aria-describedby="_r_2_-loading-announcement _r_1_"
+              aria-label="Gitify"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-home"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                aria-label="Gitify Logo"
+                class="size-5"
+                viewBox="0 0 500 500"
+                xmlns="https://www.w3.org/2000/svg"
+                xmlns:xlink="https://www.w3.org/1999/xlink"
+              >
+                <defs>
+                  <lineargradient
+                    id="linearGradient-light"
+                    x1="90.8779989%"
+                    x2="-1.30249747%"
+                    y1="80.0676288%"
+                    y2="32.7108237%"
+                  >
+                    <stop
+                      offset="0%"
+                      stop-color="#CCCCCC"
+                    />
+                    <stop
+                      offset="100%"
+                      stop-color="#FFFFFF"
+                    />
+                  </lineargradient>
+                </defs>
+                <g
+                  fill="none"
+                  fill-rule="evenodd"
+                  stroke="none"
+                  stroke-width="1"
+                >
+                  <g
+                    fill="url(#linearGradient-light)"
+                    fill-rule="nonzero"
+                    id="Logo"
+                    transform="translate(6.000000, 6.000000)"
+                  >
+                    <path
+                      d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                    />
+                  </g>
+                </g>
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_1_"
+              popover="auto"
+              role="tooltip"
+            >
+              Home
+            </span>
+            <button
+              aria-describedby="_r_4_-loading-announcement _r_3_"
+              aria-label="Notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-notifications"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                <stop
-                  offset="0%"
-                  stop-color="#CCCCCC"
+                <path
+                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
                 />
-                <stop
-                  offset="100%"
-                  stop-color="#FFFFFF"
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_3_"
+              popover="auto"
+              role="tooltip"
+            >
+              undefined unread notifications ↗
+            </span>
+            <button
+              aria-describedby="_r_6_-loading-announcement _r_5_"
+              aria-label="Filters"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-filter-notifications"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-filter"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M.75 3h14.5a.75.75 0 0 1 0 1.5H.75a.75.75 0 0 1 0-1.5ZM3 7.75A.75.75 0 0 1 3.75 7h8.5a.75.75 0 0 1 0 1.5h-8.5A.75.75 0 0 1 3 7.75Zm3 4a.75.75 0 0 1 .75-.75h2.5a.75.75 0 0 1 0 1.5h-2.5a.75.75 0 0 1-.75-.75Z"
                 />
-              </lineargradient>
-            </defs>
-            <g
-              fill="none"
-              fill-rule="evenodd"
-              stroke="none"
-              stroke-width="1"
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_5_"
+              popover="auto"
+              role="tooltip"
+            >
+              Filter notifications
+            </span>
+            <button
+              aria-describedby="_r_8_-loading-announcement"
+              aria-labelledby="_r_7_"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-my-issues"
+              data-variant="invisible"
+              type="button"
             >
-              <g
-                fill="url(#linearGradient-light)"
-                fill-rule="nonzero"
-                id="Logo"
-                transform="translate(6.000000, 6.000000)"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
                 <path
-                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-              </g>
-            </g>
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_0_"
-          popover="auto"
-          role="tooltip"
-        >
-          Home
-        </span>
-        <button
-          aria-describedby="_r_3_-loading-announcement _r_2_"
-          aria-label="Notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-notifications"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_2_"
-          popover="auto"
-          role="tooltip"
-        >
-          undefined unread notifications ↗
-        </span>
-        <button
-          aria-describedby="_r_5_-loading-announcement"
-          aria-labelledby="_r_4_"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-my-issues"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_4_"
-          popover="auto"
-        >
-          My issues ↗
-        </span>
-        <button
-          aria-describedby="_r_7_-loading-announcement"
-          aria-labelledby="_r_6_"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-my-pull-requests"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_6_"
-          popover="auto"
-        >
-          My pull requests ↗
-        </span>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="normal"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_9_-loading-announcement"
-          aria-labelledby="_r_8_"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-quit"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-x-circle"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_7_"
+              popover="auto"
+            >
+              My issues ↗
+            </span>
+            <button
+              aria-describedby="_r_a_-loading-announcement"
+              aria-labelledby="_r_9_"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-my-pull-requests"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_9_"
+              popover="auto"
+            >
+              My pull requests ↗
+            </span>
+          </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="normal"
+            data-wrap="nowrap"
           >
-            <path
-              d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_8_"
-          popover="auto"
-        >
-          Quit Gitify
-        </span>
+            <div
+              data-loading-wrapper="true"
+            >
+              <button
+                aria-describedby="_r_c_-loading-announcement _r_b_"
+                aria-label="Refresh"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-refresh"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-sync"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
+                  />
+                </svg>
+              </button>
+            </div>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_b_"
+              popover="auto"
+              role="tooltip"
+            >
+              Refresh notifications
+            </span>
+            <button
+              aria-describedby="_r_e_-loading-announcement"
+              aria-labelledby="_r_d_"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-settings"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-gear"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 0a8.2 8.2 0 0 1 .701.031C9.444.095 9.99.645 10.16 1.29l.288 1.107c.018.066.079.158.212.224.231.114.454.243.668.386.123.082.233.09.299.071l1.103-.303c.644-.176 1.392.021 1.82.63.27.385.506.792.704 1.218.315.675.111 1.422-.364 1.891l-.814.806c-.049.048-.098.147-.088.294.016.257.016.515 0 .772-.01.147.038.246.088.294l.814.806c.475.469.679 1.216.364 1.891a7.977 7.977 0 0 1-.704 1.217c-.428.61-1.176.807-1.82.63l-1.102-.302c-.067-.019-.177-.011-.3.071a5.909 5.909 0 0 1-.668.386c-.133.066-.194.158-.211.224l-.29 1.106c-.168.646-.715 1.196-1.458 1.26a8.006 8.006 0 0 1-1.402 0c-.743-.064-1.289-.614-1.458-1.26l-.289-1.106c-.018-.066-.079-.158-.212-.224a5.738 5.738 0 0 1-.668-.386c-.123-.082-.233-.09-.299-.071l-1.103.303c-.644.176-1.392-.021-1.82-.63a8.12 8.12 0 0 1-.704-1.218c-.315-.675-.111-1.422.363-1.891l.815-.806c.05-.048.098-.147.088-.294a6.214 6.214 0 0 1 0-.772c.01-.147-.038-.246-.088-.294l-.815-.806C.635 6.045.431 5.298.746 4.623a7.92 7.92 0 0 1 .704-1.217c.428-.61 1.176-.807 1.82-.63l1.102.302c.067.019.177.011.3-.071.214-.143.437-.272.668-.386.133-.066.194-.158.211-.224l.29-1.106C6.009.645 6.556.095 7.299.03 7.53.01 7.764 0 8 0Zm-.571 1.525c-.036.003-.108.036-.137.146l-.289 1.105c-.147.561-.549.967-.998 1.189-.173.086-.34.183-.5.29-.417.278-.97.423-1.529.27l-1.103-.303c-.109-.03-.175.016-.195.045-.22.312-.412.644-.573.99-.014.031-.021.11.059.19l.815.806c.411.406.562.957.53 1.456a4.709 4.709 0 0 0 0 .582c.032.499-.119 1.05-.53 1.456l-.815.806c-.081.08-.073.159-.059.19.162.346.353.677.573.989.02.03.085.076.195.046l1.102-.303c.56-.153 1.113-.008 1.53.27.161.107.328.204.501.29.447.222.85.629.997 1.189l.289 1.105c.029.109.101.143.137.146a6.6 6.6 0 0 0 1.142 0c.036-.003.108-.036.137-.146l.289-1.105c.147-.561.549-.967.998-1.189.173-.086.34-.183.5-.29.417-.278.97-.423 1.529-.27l1.103.303c.109.029.175-.016.195-.045.22-.313.411-.644.573-.99.014-.031.021-.11-.059-.19l-.815-.806c-.411-.406-.562-.957-.53-1.456a4.709 4.709 0 0 0 0-.582c-.032-.499.119-1.05.53-1.456l.815-.806c.081-.08.073-.159.059-.19a6.464 6.464 0 0 0-.573-.989c-.02-.03-.085-.076-.195-.046l-1.102.303c-.56.153-1.113.008-1.53-.27a4.44 4.44 0 0 0-.501-.29c-.447-.222-.85-.629-.997-1.189l-.289-1.105c-.029-.11-.101-.143-.137-.146a6.6 6.6 0 0 0-1.142 0ZM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0ZM9.5 8a1.5 1.5 0 1 0-3.001.001A1.5 1.5 0 0 0 9.5 8Z"
+                />
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_d_"
+              popover="auto"
+            >
+              Settings
+            </span>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -637,510 +823,532 @@ exports[`renderer/components/Sidebar.tsx should render itself & its children (lo
   "baseElement": <body>
     <div>
       <div
-        class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="space-between"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            aria-describedby="_r_b_-loading-announcement _r_a_"
-            aria-label="Gitify"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-home"
-            data-variant="invisible"
-            type="button"
+          <div
+            class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="vertical"
+            data-justify="space-between"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              aria-label="Gitify Logo"
-              class="size-5"
-              viewBox="0 0 500 500"
-              xmlns="https://www.w3.org/2000/svg"
-              xmlns:xlink="https://www.w3.org/1999/xlink"
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="normal"
+              data-wrap="nowrap"
             >
-              <defs>
-                <lineargradient
-                  id="linearGradient-light"
-                  x1="90.8779989%"
-                  x2="-1.30249747%"
-                  y1="80.0676288%"
-                  y2="32.7108237%"
+              <button
+                aria-describedby="_r_h_-loading-announcement _r_g_"
+                aria-label="Gitify"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-home"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  aria-label="Gitify Logo"
+                  class="size-5"
+                  viewBox="0 0 500 500"
+                  xmlns="https://www.w3.org/2000/svg"
+                  xmlns:xlink="https://www.w3.org/1999/xlink"
+                >
+                  <defs>
+                    <lineargradient
+                      id="linearGradient-light"
+                      x1="90.8779989%"
+                      x2="-1.30249747%"
+                      y1="80.0676288%"
+                      y2="32.7108237%"
+                    >
+                      <stop
+                        offset="0%"
+                        stop-color="#CCCCCC"
+                      />
+                      <stop
+                        offset="100%"
+                        stop-color="#FFFFFF"
+                      />
+                    </lineargradient>
+                  </defs>
+                  <g
+                    fill="none"
+                    fill-rule="evenodd"
+                    stroke="none"
+                    stroke-width="1"
+                  >
+                    <g
+                      fill="url(#linearGradient-light)"
+                      fill-rule="nonzero"
+                      id="Logo"
+                      transform="translate(6.000000, 6.000000)"
+                    >
+                      <path
+                        d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                      />
+                    </g>
+                  </g>
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_g_"
+                popover="auto"
+                role="tooltip"
+              >
+                Home
+              </span>
+              <button
+                aria-describedby="_r_j_-loading-announcement _r_i_"
+                aria-label="Notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-notifications"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_i_"
+                popover="auto"
+                role="tooltip"
+              >
+                undefined unread notifications ↗
+              </span>
+              <button
+                aria-describedby="_r_l_-loading-announcement"
+                aria-labelledby="_r_k_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-my-issues"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <stop
-                    offset="0%"
-                    stop-color="#CCCCCC"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
-                  <stop
-                    offset="100%"
-                    stop-color="#FFFFFF"
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                   />
-                </lineargradient>
-              </defs>
-              <g
-                fill="none"
-                fill-rule="evenodd"
-                stroke="none"
-                stroke-width="1"
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_k_"
+                popover="auto"
               >
-                <g
-                  fill="url(#linearGradient-light)"
-                  fill-rule="nonzero"
-                  id="Logo"
-                  transform="translate(6.000000, 6.000000)"
+                My issues ↗
+              </span>
+              <button
+                aria-describedby="_r_n_-loading-announcement"
+                aria-labelledby="_r_m_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-my-pull-requests"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
                   <path
-                    d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
                   />
-                </g>
-              </g>
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_a_"
-            popover="auto"
-            role="tooltip"
-          >
-            Home
-          </span>
-          <button
-            aria-describedby="_r_d_-loading-announcement _r_c_"
-            aria-label="Notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-notifications"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_c_"
-            popover="auto"
-            role="tooltip"
-          >
-            undefined unread notifications ↗
-          </span>
-          <button
-            aria-describedby="_r_f_-loading-announcement"
-            aria-labelledby="_r_e_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-my-issues"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_e_"
-            popover="auto"
-          >
-            My issues ↗
-          </span>
-          <button
-            aria-describedby="_r_h_-loading-announcement"
-            aria-labelledby="_r_g_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-my-pull-requests"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_g_"
-            popover="auto"
-          >
-            My pull requests ↗
-          </span>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_j_-loading-announcement"
-            aria-labelledby="_r_i_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-quit"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-x-circle"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_m_"
+                popover="auto"
+              >
+                My pull requests ↗
+              </span>
+            </div>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="normal"
+              data-wrap="nowrap"
             >
-              <path
-                d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_i_"
-            popover="auto"
-          >
-            Quit Gitify
-          </span>
+              <button
+                aria-describedby="_r_p_-loading-announcement"
+                aria-labelledby="_r_o_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-quit"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-x-circle"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_o_"
+                popover="auto"
+              >
+                Quit Gitify
+              </span>
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="vertical"
-      data-justify="space-between"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="normal"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_b_-loading-announcement _r_a_"
-          aria-label="Gitify"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-home"
-          data-variant="invisible"
-          type="button"
+        <div
+          class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
+          data-align="stretch"
+          data-direction="vertical"
+          data-justify="space-between"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <svg
-            aria-hidden="true"
-            aria-label="Gitify Logo"
-            class="size-5"
-            viewBox="0 0 500 500"
-            xmlns="https://www.w3.org/2000/svg"
-            xmlns:xlink="https://www.w3.org/1999/xlink"
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="normal"
+            data-wrap="nowrap"
           >
-            <defs>
-              <lineargradient
-                id="linearGradient-light"
-                x1="90.8779989%"
-                x2="-1.30249747%"
-                y1="80.0676288%"
-                y2="32.7108237%"
+            <button
+              aria-describedby="_r_h_-loading-announcement _r_g_"
+              aria-label="Gitify"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-home"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                aria-label="Gitify Logo"
+                class="size-5"
+                viewBox="0 0 500 500"
+                xmlns="https://www.w3.org/2000/svg"
+                xmlns:xlink="https://www.w3.org/1999/xlink"
               >
-                <stop
-                  offset="0%"
-                  stop-color="#CCCCCC"
+                <defs>
+                  <lineargradient
+                    id="linearGradient-light"
+                    x1="90.8779989%"
+                    x2="-1.30249747%"
+                    y1="80.0676288%"
+                    y2="32.7108237%"
+                  >
+                    <stop
+                      offset="0%"
+                      stop-color="#CCCCCC"
+                    />
+                    <stop
+                      offset="100%"
+                      stop-color="#FFFFFF"
+                    />
+                  </lineargradient>
+                </defs>
+                <g
+                  fill="none"
+                  fill-rule="evenodd"
+                  stroke="none"
+                  stroke-width="1"
+                >
+                  <g
+                    fill="url(#linearGradient-light)"
+                    fill-rule="nonzero"
+                    id="Logo"
+                    transform="translate(6.000000, 6.000000)"
+                  >
+                    <path
+                      d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                    />
+                  </g>
+                </g>
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_g_"
+              popover="auto"
+              role="tooltip"
+            >
+              Home
+            </span>
+            <button
+              aria-describedby="_r_j_-loading-announcement _r_i_"
+              aria-label="Notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-notifications"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                />
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_i_"
+              popover="auto"
+              role="tooltip"
+            >
+              undefined unread notifications ↗
+            </span>
+            <button
+              aria-describedby="_r_l_-loading-announcement"
+              aria-labelledby="_r_k_"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-my-issues"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-                <stop
-                  offset="100%"
-                  stop-color="#FFFFFF"
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                 />
-              </lineargradient>
-            </defs>
-            <g
-              fill="none"
-              fill-rule="evenodd"
-              stroke="none"
-              stroke-width="1"
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_k_"
+              popover="auto"
+            >
+              My issues ↗
+            </span>
+            <button
+              aria-describedby="_r_n_-loading-announcement"
+              aria-labelledby="_r_m_"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-my-pull-requests"
+              data-variant="invisible"
+              type="button"
             >
-              <g
-                fill="url(#linearGradient-light)"
-                fill-rule="nonzero"
-                id="Logo"
-                transform="translate(6.000000, 6.000000)"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
                 <path
-                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
                 />
-              </g>
-            </g>
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_a_"
-          popover="auto"
-          role="tooltip"
-        >
-          Home
-        </span>
-        <button
-          aria-describedby="_r_d_-loading-announcement _r_c_"
-          aria-label="Notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-notifications"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_c_"
-          popover="auto"
-          role="tooltip"
-        >
-          undefined unread notifications ↗
-        </span>
-        <button
-          aria-describedby="_r_f_-loading-announcement"
-          aria-labelledby="_r_e_"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-my-issues"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_e_"
-          popover="auto"
-        >
-          My issues ↗
-        </span>
-        <button
-          aria-describedby="_r_h_-loading-announcement"
-          aria-labelledby="_r_g_"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-my-pull-requests"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_g_"
-          popover="auto"
-        >
-          My pull requests ↗
-        </span>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="normal"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_j_-loading-announcement"
-          aria-labelledby="_r_i_"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="sidebar-quit"
-          data-variant="invisible"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-x-circle"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_m_"
+              popover="auto"
+            >
+              My pull requests ↗
+            </span>
+          </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="normal"
+            data-wrap="nowrap"
           >
-            <path
-              d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_i_"
-          popover="auto"
-        >
-          Quit Gitify
-        </span>
+            <button
+              aria-describedby="_r_p_-loading-announcement"
+              aria-labelledby="_r_o_"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="sidebar-quit"
+              data-variant="invisible"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-x-circle"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
+                />
+              </svg>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_o_"
+              popover="auto"
+            >
+              Quit Gitify
+            </span>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/avatars/AvatarWithFallback.test.tsx b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
index 090109855..b82fffaf9 100644
--- a/src/renderer/components/avatars/AvatarWithFallback.test.tsx
+++ b/src/renderer/components/avatars/AvatarWithFallback.test.tsx
@@ -1,5 +1,6 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, screen } from '@testing-library/react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { type Link, Size } from '../../types';
 import {
   AvatarWithFallback,
@@ -16,25 +17,27 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   };
 
   it('should render avatar - human user', () => {
-    const tree = render(<AvatarWithFallback {...props} />);
+    const tree = renderWithAppContext(<AvatarWithFallback {...props} />);
     expect(tree).toMatchSnapshot();
   });
 
   it('should render avatar - non-human user', () => {
-    const tree = render(
+    const tree = renderWithAppContext(
       <AvatarWithFallback {...props} userType={'Organization'} />,
     );
     expect(tree).toMatchSnapshot();
   });
 
   it('renders the fallback icon when no src url - human user', () => {
-    const tree = render(<AvatarWithFallback {...props} src={null} />);
+    const tree = renderWithAppContext(
+      <AvatarWithFallback {...props} src={null} />,
+    );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('renders the fallback icon when no src url - non human user', () => {
-    const tree = render(
+    const tree = renderWithAppContext(
       <AvatarWithFallback {...props} src={null} userType="Bot" />,
     );
 
@@ -42,7 +45,7 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   });
 
   it('renders the fallback icon when the image fails to load (isBroken = true) - human user', () => {
-    render(<AvatarWithFallback {...props} />);
+    renderWithAppContext(<AvatarWithFallback {...props} />);
 
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
@@ -54,7 +57,7 @@ describe('renderer/components/avatars/AvatarWithFallback.tsx', () => {
   });
 
   it('renders the fallback icon when the image fails to load (isBroken = true) - non human user', () => {
-    render(<AvatarWithFallback {...props} userType={'Bot'} />);
+    renderWithAppContext(<AvatarWithFallback {...props} userType={'Bot'} />);
 
     // Find the avatar element by its alt text
     const avatar = screen.getByAltText('gitify-app') as HTMLImageElement;
diff --git a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
index 262ce90c7..c5b1f1085 100644
--- a/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
+++ b/src/renderer/components/avatars/__snapshots__/AvatarWithFallback.test.tsx.snap
@@ -6,76 +6,98 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback
   "baseElement": <body>
     <div>
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-feed-person"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
-        >
-          <path
-            d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-          />
-        </svg>
         <div
-          class="prc-Truncate-Truncate-A9Wn6"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          @gitify-app
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-feed-person"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+              />
+            </svg>
+            <div
+              class="prc-Truncate-Truncate-A9Wn6"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@gitify-app"
+            >
+              @gitify-app
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-testid="avatar"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-feed-person"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="16"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 16 16"
-        width="16"
-      >
-        <path
-          d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
-        />
-      </svg>
       <div
-        class="prc-Truncate-Truncate-A9Wn6"
-        data-inline="true"
-        style="--truncate-max-width: 280px;"
-        title="@gitify-app"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        @gitify-app
+        <div
+          class="prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-feed-person"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+            />
+          </svg>
+          <div
+            class="prc-Truncate-Truncate-A9Wn6"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="@gitify-app"
+          >
+            @gitify-app
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -139,76 +161,98 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx renders the fallback
   "baseElement": <body>
     <div>
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
-        >
-          <path
-            d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-          />
-        </svg>
         <div
-          class="prc-Truncate-Truncate-A9Wn6"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          @gitify-app
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+            <div
+              class="prc-Truncate-Truncate-A9Wn6"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@gitify-app"
+            >
+              @gitify-app
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-testid="avatar"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-mark-github"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="16"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 16 16"
-        width="16"
-      >
-        <path
-          d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-        />
-      </svg>
       <div
-        class="prc-Truncate-Truncate-A9Wn6"
-        data-inline="true"
-        style="--truncate-max-width: 280px;"
-        title="@gitify-app"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        @gitify-app
+        <div
+          class="prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-mark-github"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+            />
+          </svg>
+          <div
+            class="prc-Truncate-Truncate-A9Wn6"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="@gitify-app"
+          >
+            @gitify-app
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -348,62 +392,84 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar
   "baseElement": <body>
     <div>
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <img
-          alt="gitify-app"
-          class="prc-Avatar-Avatar-ZRS-m"
-          data-component="Avatar"
-          height="16"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          style="--avatarSize-regular: 16px;"
-          width="16"
-        />
         <div
-          class="prc-Truncate-Truncate-A9Wn6"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          @gitify-app
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="gitify-app"
+              class="prc-Avatar-Avatar-ZRS-m"
+              data-component="Avatar"
+              height="16"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              style="--avatarSize-regular: 16px;"
+              width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-A9Wn6"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@gitify-app"
+            >
+              @gitify-app
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-testid="avatar"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <img
-        alt="gitify-app"
-        class="prc-Avatar-Avatar-ZRS-m"
-        data-component="Avatar"
-        height="16"
-        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-        style="--avatarSize-regular: 16px;"
-        width="16"
-      />
       <div
-        class="prc-Truncate-Truncate-A9Wn6"
-        data-inline="true"
-        style="--truncate-max-width: 280px;"
-        title="@gitify-app"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        @gitify-app
+        <div
+          class="prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <img
+            alt="gitify-app"
+            class="prc-Avatar-Avatar-ZRS-m"
+            data-component="Avatar"
+            height="16"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            style="--avatarSize-regular: 16px;"
+            width="16"
+          />
+          <div
+            class="prc-Truncate-Truncate-A9Wn6"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="@gitify-app"
+          >
+            @gitify-app
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -467,64 +533,86 @@ exports[`renderer/components/avatars/AvatarWithFallback.tsx should render avatar
   "baseElement": <body>
     <div>
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <img
-          alt="gitify-app"
-          class="prc-Avatar-Avatar-ZRS-m"
-          data-component="Avatar"
-          data-square=""
-          height="16"
-          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-          style="--avatarSize-regular: 16px;"
-          width="16"
-        />
         <div
-          class="prc-Truncate-Truncate-A9Wn6"
-          data-inline="true"
-          style="--truncate-max-width: 280px;"
-          title="@gitify-app"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          @gitify-app
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-testid="avatar"
+            data-wrap="nowrap"
+          >
+            <img
+              alt="gitify-app"
+              class="prc-Avatar-Avatar-ZRS-m"
+              data-component="Avatar"
+              data-square=""
+              height="16"
+              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+              style="--avatarSize-regular: 16px;"
+              width="16"
+            />
+            <div
+              class="prc-Truncate-Truncate-A9Wn6"
+              data-inline="true"
+              style="--truncate-max-width: 280px;"
+              title="@gitify-app"
+            >
+              @gitify-app
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-testid="avatar"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <img
-        alt="gitify-app"
-        class="prc-Avatar-Avatar-ZRS-m"
-        data-component="Avatar"
-        data-square=""
-        height="16"
-        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-        style="--avatarSize-regular: 16px;"
-        width="16"
-      />
       <div
-        class="prc-Truncate-Truncate-A9Wn6"
-        data-inline="true"
-        style="--truncate-max-width: 280px;"
-        title="@gitify-app"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        @gitify-app
+        <div
+          class="prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-testid="avatar"
+          data-wrap="nowrap"
+        >
+          <img
+            alt="gitify-app"
+            class="prc-Avatar-Avatar-ZRS-m"
+            data-component="Avatar"
+            data-square=""
+            height="16"
+            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+            style="--avatarSize-regular: 16px;"
+            width="16"
+          />
+          <div
+            class="prc-Truncate-Truncate-A9Wn6"
+            data-inline="true"
+            style="--truncate-max-width: 280px;"
+            title="@gitify-app"
+          >
+            @gitify-app
+          </div>
+        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/fields/Checkbox.test.tsx b/src/renderer/components/fields/Checkbox.test.tsx
index 0050b58c6..9cd8a0bb1 100644
--- a/src/renderer/components/fields/Checkbox.test.tsx
+++ b/src/renderer/components/fields/Checkbox.test.tsx
@@ -1,5 +1,4 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Checkbox, type CheckboxProps } from './Checkbox';
 
 describe('renderer/components/fields/Checkbox.tsx', () => {
@@ -11,39 +10,43 @@ describe('renderer/components/fields/Checkbox.tsx', () => {
   };
 
   it('should render - visible', () => {
-    const tree = render(<Checkbox {...props} />);
+    const tree = renderWithAppContext(<Checkbox {...props} />);
     expect(tree).toMatchSnapshot();
   });
 
   it('should render - not visible', () => {
-    const tree = render(<Checkbox visible={false} {...props} />);
+    const tree = renderWithAppContext(<Checkbox visible={false} {...props} />);
     expect(tree).toMatchSnapshot();
   });
 
   it('should render - disabled', () => {
-    const tree = render(<Checkbox disabled={true} {...props} />);
+    const tree = renderWithAppContext(<Checkbox disabled={true} {...props} />);
     expect(tree).toMatchSnapshot();
   });
 
   it('should render - tooltip', () => {
-    const tree = render(
+    const tree = renderWithAppContext(
       <Checkbox {...props} tooltip={<div>Hello world</div>} />,
     );
     expect(tree).toMatchSnapshot();
   });
 
   it('should render - positive counter unselected', () => {
-    const tree = render(<Checkbox {...props} checked={false} counter={5} />);
+    const tree = renderWithAppContext(
+      <Checkbox {...props} checked={false} counter={5} />,
+    );
     expect(tree).toMatchSnapshot();
   });
 
   it('should render - positive counter selected', () => {
-    const tree = render(<Checkbox {...props} checked={true} counter={5} />);
+    const tree = renderWithAppContext(
+      <Checkbox {...props} checked={true} counter={5} />,
+    );
     expect(tree).toMatchSnapshot();
   });
 
   it('should render - zero counter', () => {
-    const tree = render(<Checkbox {...props} counter={0} />);
+    const tree = renderWithAppContext(<Checkbox {...props} counter={0} />);
     expect(tree).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/fields/FieldLabel.test.tsx b/src/renderer/components/fields/FieldLabel.test.tsx
index 26a243bfa..44a3037d8 100644
--- a/src/renderer/components/fields/FieldLabel.test.tsx
+++ b/src/renderer/components/fields/FieldLabel.test.tsx
@@ -1,5 +1,4 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { FieldLabel, type FieldLabelProps } from './FieldLabel';
 
 describe('renderer/components/fields/FieldLabel.tsx', () => {
@@ -9,7 +8,7 @@ describe('renderer/components/fields/FieldLabel.tsx', () => {
   };
 
   it('should render', () => {
-    const tree = render(<FieldLabel {...props} />);
+    const tree = renderWithAppContext(<FieldLabel {...props} />);
     expect(tree).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/fields/RadioGroup.test.tsx b/src/renderer/components/fields/RadioGroup.test.tsx
index 9f7aed66b..2f6f4789f 100644
--- a/src/renderer/components/fields/RadioGroup.test.tsx
+++ b/src/renderer/components/fields/RadioGroup.test.tsx
@@ -1,5 +1,4 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { RadioGroup, type RadioGroupProps } from './RadioGroup';
 
 describe('renderer/components/fields/RadioGroup.tsx', () => {
@@ -15,14 +14,14 @@ describe('renderer/components/fields/RadioGroup.tsx', () => {
   };
 
   it('should render', () => {
-    const tree = render(<RadioGroup {...props} />);
+    const tree = renderWithAppContext(<RadioGroup {...props} />);
     expect(tree).toMatchSnapshot();
   });
 
   it('should render as disabled', () => {
     const mockProps = { ...props, disabled: true };
 
-    const tree = render(<RadioGroup {...mockProps} />);
+    const tree = renderWithAppContext(<RadioGroup {...mockProps} />);
     expect(tree).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/fields/Tooltip.test.tsx b/src/renderer/components/fields/Tooltip.test.tsx
index 40d59fc6d..3669ed4db 100644
--- a/src/renderer/components/fields/Tooltip.test.tsx
+++ b/src/renderer/components/fields/Tooltip.test.tsx
@@ -1,10 +1,7 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { BaseStyles, ThemeProvider } from '@primer/react';
-
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Tooltip, type TooltipProps } from './Tooltip';
 
 describe('renderer/components/fields/Tooltip.tsx', () => {
@@ -14,37 +11,13 @@ describe('renderer/components/fields/Tooltip.tsx', () => {
   };
 
   it('should render', () => {
-    render(
-      <ThemeProvider>
-        <BaseStyles>
-          <AppContext.Provider
-            value={{
-              settings: mockSettings,
-            }}
-          >
-            <Tooltip {...props} />
-          </AppContext.Provider>
-        </BaseStyles>
-      </ThemeProvider>,
-    );
+    renderWithAppContext(<Tooltip {...props} />, {});
 
     expect(screen.getByTestId('tooltip-test')).toBeInTheDocument();
   });
 
   it('should display on mouse enter / leave', async () => {
-    render(
-      <ThemeProvider>
-        <BaseStyles>
-          <AppContext.Provider
-            value={{
-              settings: mockSettings,
-            }}
-          >
-            <Tooltip {...props} />
-          </AppContext.Provider>
-        </BaseStyles>
-      </ThemeProvider>,
-    );
+    renderWithAppContext(<Tooltip {...props} />, {});
 
     const tooltipElement = screen.getByTestId('tooltip-test');
 
diff --git a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
index 191184d5d..a2f43b44f 100644
--- a/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/Checkbox.test.tsx.snap
@@ -6,55 +6,77 @@ exports[`renderer/components/fields/Checkbox.tsx should render - disabled 1`] =
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <input
-          checked=""
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          disabled=""
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer line-through"
-          for="appearance"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          Appearance
-        </label>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-appearance"
+              disabled=""
+              id="appearance"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer line-through"
+              for="appearance"
+            >
+              Appearance
+            </label>
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <input
-        checked=""
-        class="size-4 rounded-sm cursor-pointer"
-        data-testid="checkbox-appearance"
-        disabled=""
-        id="appearance"
-        type="checkbox"
-      />
-      <label
-        class="font-medium text-gitify-font cursor-pointer line-through"
-        for="appearance"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        Appearance
-      </label>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            checked=""
+            class="size-4 rounded-sm cursor-pointer"
+            data-testid="checkbox-appearance"
+            disabled=""
+            id="appearance"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer line-through"
+            for="appearance"
+          >
+            Appearance
+          </label>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -115,9 +137,31 @@ exports[`renderer/components/fields/Checkbox.tsx should render - not visible 1`]
 {
   "asFragment": [Function],
   "baseElement": <body>
-    <div />
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        />
+      </div>
+    </div>
   </body>,
-  "container": <div />,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      />
+    </div>
+  </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
   "findAllByDisplayValue": [Function],
@@ -178,63 +222,85 @@ exports[`renderer/components/fields/Checkbox.tsx should render - positive counte
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <input
-          checked=""
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <span
-          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          5
-        </span>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-appearance"
+              id="appearance"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+            >
+              5
+            </span>
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <input
-        checked=""
-        class="size-4 rounded-sm cursor-pointer"
-        data-testid="checkbox-appearance"
-        id="appearance"
-        type="checkbox"
-      />
-      <label
-        class="font-medium text-gitify-font cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-      <span
-        class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        5
-      </span>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            checked=""
+            class="size-4 rounded-sm cursor-pointer"
+            data-testid="checkbox-appearance"
+            id="appearance"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="appearance"
+          >
+            Appearance
+          </label>
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+          >
+            5
+          </span>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -297,61 +363,83 @@ exports[`renderer/components/fields/Checkbox.tsx should render - positive counte
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <input
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <span
-          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          5
-        </span>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-appearance"
+              id="appearance"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            >
+              5
+            </span>
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <input
-        class="size-4 rounded-sm cursor-pointer"
-        data-testid="checkbox-appearance"
-        id="appearance"
-        type="checkbox"
-      />
-      <label
-        class="font-medium text-gitify-font cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-      <span
-        class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        5
-      </span>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            class="size-4 rounded-sm cursor-pointer"
+            data-testid="checkbox-appearance"
+            id="appearance"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="appearance"
+          >
+            Appearance
+          </label>
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+          >
+            5
+          </span>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -414,105 +502,127 @@ exports[`renderer/components/fields/Checkbox.tsx should render - tooltip 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <input
-          checked=""
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
-        <button
-          aria-expanded="false"
-          aria-haspopup="true"
-          aria-label="tooltip-appearance"
-          data-testid="tooltip-tooltip-appearance"
-          id="tooltip-appearance"
-          tabindex="0"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-question text-gitify-tooltip-icon"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <path
-              d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+            <input
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-appearance"
+              id="appearance"
+              type="checkbox"
             />
-          </svg>
-        </button>
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+            <button
+              aria-expanded="false"
+              aria-haspopup="true"
+              aria-label="tooltip-appearance"
+              data-testid="tooltip-tooltip-appearance"
+              id="tooltip-appearance"
+              tabindex="0"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-question text-gitify-tooltip-icon"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <input
-        checked=""
-        class="size-4 rounded-sm cursor-pointer"
-        data-testid="checkbox-appearance"
-        id="appearance"
-        type="checkbox"
-      />
-      <label
-        class="font-medium text-gitify-font cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-      <button
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="tooltip-appearance"
-        data-testid="tooltip-tooltip-appearance"
-        id="tooltip-appearance"
-        tabindex="0"
-        type="button"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-question text-gitify-tooltip-icon"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
         >
-          <path
-            d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+          <input
+            checked=""
+            class="size-4 rounded-sm cursor-pointer"
+            data-testid="checkbox-appearance"
+            id="appearance"
+            type="checkbox"
           />
-        </svg>
-      </button>
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="appearance"
+          >
+            Appearance
+          </label>
+          <button
+            aria-expanded="false"
+            aria-haspopup="true"
+            aria-label="tooltip-appearance"
+            data-testid="tooltip-tooltip-appearance"
+            id="tooltip-appearance"
+            tabindex="0"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-question text-gitify-tooltip-icon"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              />
+            </svg>
+          </button>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -575,53 +685,75 @@ exports[`renderer/components/fields/Checkbox.tsx should render - visible 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <input
-          checked=""
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          Appearance
-        </label>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-appearance"
+              id="appearance"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <input
-        checked=""
-        class="size-4 rounded-sm cursor-pointer"
-        data-testid="checkbox-appearance"
-        id="appearance"
-        type="checkbox"
-      />
-      <label
-        class="font-medium text-gitify-font cursor-pointer"
-        for="appearance"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        Appearance
-      </label>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            checked=""
+            class="size-4 rounded-sm cursor-pointer"
+            data-testid="checkbox-appearance"
+            id="appearance"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="appearance"
+          >
+            Appearance
+          </label>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -684,63 +816,85 @@ exports[`renderer/components/fields/Checkbox.tsx should render - zero counter 1`
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <input
-          checked=""
-          class="size-4 rounded-sm cursor-pointer"
-          data-testid="checkbox-appearance"
-          id="appearance"
-          type="checkbox"
-        />
-        <label
-          class="font-medium text-gitify-font cursor-pointer"
-          for="appearance"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          Appearance
-        </label>
-        <span
-          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
-        >
-          0
-        </span>
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 rounded-sm cursor-pointer"
+              data-testid="checkbox-appearance"
+              id="appearance"
+              type="checkbox"
+            />
+            <label
+              class="font-medium text-gitify-font cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+            <span
+              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+            >
+              0
+            </span>
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <input
-        checked=""
-        class="size-4 rounded-sm cursor-pointer"
-        data-testid="checkbox-appearance"
-        id="appearance"
-        type="checkbox"
-      />
-      <label
-        class="font-medium text-gitify-font cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-      <span
-        class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        0
-      </span>
+        <div
+          class="text-sm prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          <input
+            checked=""
+            class="size-4 rounded-sm cursor-pointer"
+            data-testid="checkbox-appearance"
+            id="appearance"
+            type="checkbox"
+          />
+          <label
+            class="font-medium text-gitify-font cursor-pointer"
+            for="appearance"
+          >
+            Appearance
+          </label>
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-primary prc-Text-Text-0ima0"
+          >
+            0
+          </span>
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap b/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap
index e69ae5347..2f560d960 100644
--- a/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/FieldLabel.test.tsx.snap
@@ -5,21 +5,43 @@ exports[`renderer/components/fields/FieldLabel.tsx should render 1`] = `
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <label
-        class="mr-1 font-medium cursor-pointer"
-        for="appearance"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        Appearance
-      </label>
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <label
+            class="mr-1 font-medium cursor-pointer"
+            for="appearance"
+          >
+            Appearance
+          </label>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <label
-      class="mr-1 font-medium cursor-pointer"
-      for="appearance"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      Appearance
-    </label>
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <label
+          class="mr-1 font-medium cursor-pointer"
+          for="appearance"
+        >
+          Appearance
+        </label>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap b/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap
index 0363ddb3c..9093243d7 100644
--- a/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap
+++ b/src/renderer/components/fields/__snapshots__/RadioGroup.test.tsx.snap
@@ -6,46 +6,95 @@ exports[`renderer/components/fields/RadioGroup.tsx should render 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <input
-            class="size-4 cursor-pointer"
-            data-testid="radio-appearance-one"
-            id="radio-appearance-one"
-            name="appearance"
-            type="radio"
-            value="one"
-          />
-          <label
-            class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-one"
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            Value 1
-          </label>
+            <label
+              class="mr-1 font-medium cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <input
+                class="size-4 cursor-pointer"
+                data-testid="radio-appearance-one"
+                id="radio-appearance-one"
+                name="appearance"
+                type="radio"
+                value="one"
+              />
+              <label
+                class="mr-1 font-medium cursor-pointer"
+                for="radio-appearance-one"
+              >
+                Value 1
+              </label>
+            </div>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <input
+                checked=""
+                class="size-4 cursor-pointer"
+                data-testid="radio-appearance-two"
+                id="radio-appearance-two"
+                name="appearance"
+                type="radio"
+                value="two"
+              />
+              <label
+                class="mr-1 font-medium cursor-pointer"
+                for="radio-appearance-two"
+              >
+                Value 2
+              </label>
+            </div>
+          </div>
         </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="text-sm prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
@@ -53,91 +102,64 @@ exports[`renderer/components/fields/RadioGroup.tsx should render 1`] = `
           data-padding="none"
           data-wrap="nowrap"
         >
-          <input
-            checked=""
-            class="size-4 cursor-pointer"
-            data-testid="radio-appearance-two"
-            id="radio-appearance-two"
-            name="appearance"
-            type="radio"
-            value="two"
-          />
           <label
             class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-two"
+            for="appearance"
           >
-            Value 2
+            Appearance
           </label>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-4 cursor-pointer"
+              data-testid="radio-appearance-one"
+              id="radio-appearance-one"
+              name="appearance"
+              type="radio"
+              value="one"
+            />
+            <label
+              class="mr-1 font-medium cursor-pointer"
+              for="radio-appearance-one"
+            >
+              Value 1
+            </label>
+          </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 cursor-pointer"
+              data-testid="radio-appearance-two"
+              id="radio-appearance-two"
+              name="appearance"
+              type="radio"
+              value="two"
+            />
+            <label
+              class="mr-1 font-medium cursor-pointer"
+              for="radio-appearance-two"
+            >
+              Value 2
+            </label>
+          </div>
         </div>
       </div>
     </div>
-  </body>,
-  "container": <div>
-    <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <label
-        class="mr-1 font-medium cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <input
-          class="size-4 cursor-pointer"
-          data-testid="radio-appearance-one"
-          id="radio-appearance-one"
-          name="appearance"
-          type="radio"
-          value="one"
-        />
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="radio-appearance-one"
-        >
-          Value 1
-        </label>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <input
-          checked=""
-          class="size-4 cursor-pointer"
-          data-testid="radio-appearance-two"
-          id="radio-appearance-two"
-          name="appearance"
-          type="radio"
-          value="two"
-        />
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="radio-appearance-two"
-        >
-          Value 2
-        </label>
-      </div>
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -199,46 +221,95 @@ exports[`renderer/components/fields/RadioGroup.tsx should render as disabled 1`]
   "baseElement": <body>
     <div>
       <div
-        class="text-sm prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="appearance"
-        >
-          Appearance
-        </label>
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <input
-            class="size-4 cursor-pointer"
-            data-testid="radio-appearance-one"
-            id="radio-appearance-one"
-            name="appearance"
-            type="radio"
-            value="one"
-          />
-          <label
-            class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-one"
+          <div
+            class="text-sm prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            Value 1
-          </label>
+            <label
+              class="mr-1 font-medium cursor-pointer"
+              for="appearance"
+            >
+              Appearance
+            </label>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <input
+                class="size-4 cursor-pointer"
+                data-testid="radio-appearance-one"
+                id="radio-appearance-one"
+                name="appearance"
+                type="radio"
+                value="one"
+              />
+              <label
+                class="mr-1 font-medium cursor-pointer"
+                for="radio-appearance-one"
+              >
+                Value 1
+              </label>
+            </div>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <input
+                checked=""
+                class="size-4 cursor-pointer"
+                data-testid="radio-appearance-two"
+                id="radio-appearance-two"
+                name="appearance"
+                type="radio"
+                value="two"
+              />
+              <label
+                class="mr-1 font-medium cursor-pointer"
+                for="radio-appearance-two"
+              >
+                Value 2
+              </label>
+            </div>
+          </div>
         </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="text-sm prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
@@ -246,91 +317,64 @@ exports[`renderer/components/fields/RadioGroup.tsx should render as disabled 1`]
           data-padding="none"
           data-wrap="nowrap"
         >
-          <input
-            checked=""
-            class="size-4 cursor-pointer"
-            data-testid="radio-appearance-two"
-            id="radio-appearance-two"
-            name="appearance"
-            type="radio"
-            value="two"
-          />
           <label
             class="mr-1 font-medium cursor-pointer"
-            for="radio-appearance-two"
+            for="appearance"
           >
-            Value 2
+            Appearance
           </label>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              class="size-4 cursor-pointer"
+              data-testid="radio-appearance-one"
+              id="radio-appearance-one"
+              name="appearance"
+              type="radio"
+              value="one"
+            />
+            <label
+              class="mr-1 font-medium cursor-pointer"
+              for="radio-appearance-one"
+            >
+              Value 1
+            </label>
+          </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <input
+              checked=""
+              class="size-4 cursor-pointer"
+              data-testid="radio-appearance-two"
+              id="radio-appearance-two"
+              name="appearance"
+              type="radio"
+              value="two"
+            />
+            <label
+              class="mr-1 font-medium cursor-pointer"
+              for="radio-appearance-two"
+            >
+              Value 2
+            </label>
+          </div>
         </div>
       </div>
     </div>
-  </body>,
-  "container": <div>
-    <div
-      class="text-sm prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <label
-        class="mr-1 font-medium cursor-pointer"
-        for="appearance"
-      >
-        Appearance
-      </label>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <input
-          class="size-4 cursor-pointer"
-          data-testid="radio-appearance-one"
-          id="radio-appearance-one"
-          name="appearance"
-          type="radio"
-          value="one"
-        />
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="radio-appearance-one"
-        >
-          Value 1
-        </label>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <input
-          checked=""
-          class="size-4 cursor-pointer"
-          data-testid="radio-appearance-two"
-          id="radio-appearance-two"
-          name="appearance"
-          type="radio"
-          value="two"
-        />
-        <label
-          class="mr-1 font-medium cursor-pointer"
-          for="radio-appearance-two"
-        >
-          Value 2
-        </label>
-      </div>
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/filters/FilterSection.test.tsx b/src/renderer/components/filters/FilterSection.test.tsx
index 0d28d4248..62a1338d9 100644
--- a/src/renderer/components/filters/FilterSection.test.tsx
+++ b/src/renderer/components/filters/FilterSection.test.tsx
@@ -1,71 +1,64 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { MarkGithubIcon } from '@primer/octicons-react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
 import { stateFilter } from '../../utils/notifications/filters';
 import { FilterSection } from './FilterSection';
 
 describe('renderer/components/filters/FilterSection.tsx', () => {
-  const updateFilter = jest.fn();
+  const mockUpdateFilter = jest.fn();
 
   const mockFilter = stateFilter;
   const mockFilterSetting = 'filterStates';
 
   describe('should render itself & its children', () => {
     it('with detailed notifications enabled', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              detailedNotifications: true,
-            } as SettingsState,
-            notifications: mockAccountNotifications,
+      const tree = renderWithAppContext(
+        <FilterSection
+          filter={{
+            ...mockFilter,
+            requiresDetailsNotifications: true,
           }}
-        >
-          <FilterSection
-            filter={{
-              ...mockFilter,
-              requiresDetailsNotifications: true,
-            }}
-            filterSetting={mockFilterSetting}
-            icon={MarkGithubIcon}
-            id={'FilterSectionTest'}
-            title={'FilterSectionTitle'}
-          />
-        </AppContext.Provider>,
+          filterSetting={mockFilterSetting}
+          icon={MarkGithubIcon}
+          id={'FilterSectionTest'}
+          title={'FilterSectionTitle'}
+        />,
+        {
+          settings: {
+            ...mockSettings,
+            detailedNotifications: true,
+          },
+          notifications: mockAccountNotifications,
+        },
       );
 
       expect(tree).toMatchSnapshot();
     });
 
     it('with detailed notifications disabled', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              detailedNotifications: false,
-            } as SettingsState,
-            notifications: mockAccountNotifications,
+      const tree = renderWithAppContext(
+        <FilterSection
+          filter={{
+            ...mockFilter,
+            requiresDetailsNotifications: false,
           }}
-        >
-          <FilterSection
-            filter={{
-              ...mockFilter,
-              requiresDetailsNotifications: false,
-            }}
-            filterSetting={mockFilterSetting}
-            icon={MarkGithubIcon}
-            id={'FilterSectionTest'}
-            title={'FilterSectionTitle'}
-          />
-        </AppContext.Provider>,
+          filterSetting={mockFilterSetting}
+          icon={MarkGithubIcon}
+          id={'FilterSectionTest'}
+          title={'FilterSectionTitle'}
+        />,
+        {
+          settings: {
+            ...mockSettings,
+            detailedNotifications: false,
+          },
+          notifications: mockAccountNotifications,
+        },
       );
 
       expect(tree).toMatchSnapshot();
@@ -74,31 +67,31 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
 
   it('should be able to toggle filter value - none already set', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              filterStates: [],
-            },
-            notifications: [],
-            updateFilter,
-          }}
-        >
-          <FilterSection
-            filter={mockFilter}
-            filterSetting={mockFilterSetting}
-            icon={MarkGithubIcon}
-            id={'FilterSectionTest'}
-            title={'FilterSectionTitle'}
-          />
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <FilterSection
+          filter={mockFilter}
+          filterSetting={mockFilterSetting}
+          icon={MarkGithubIcon}
+          id={'FilterSectionTest'}
+          title={'FilterSectionTitle'}
+        />,
+        {
+          settings: {
+            ...mockSettings,
+            filterStates: [],
+          },
+          updateFilter: mockUpdateFilter,
+        },
       );
     });
 
     await userEvent.click(screen.getByLabelText('Open'));
 
-    expect(updateFilter).toHaveBeenCalledWith(mockFilterSetting, 'open', true);
+    expect(mockUpdateFilter).toHaveBeenCalledWith(
+      mockFilterSetting,
+      'open',
+      true,
+    );
 
     expect(
       screen.getByLabelText('Open').parentNode.parentNode,
@@ -107,31 +100,27 @@ describe('renderer/components/filters/FilterSection.tsx', () => {
 
   it('should be able to toggle filter value - some filters already set', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              filterStates: ['open'],
-            },
-            notifications: [],
-            updateFilter,
-          }}
-        >
-          <FilterSection
-            filter={mockFilter}
-            filterSetting={mockFilterSetting}
-            icon={MarkGithubIcon}
-            id={'FilterSectionTest'}
-            title={'FilterSectionTitle'}
-          />
-        </AppContext.Provider>,
+      renderWithAppContext(
+        <FilterSection
+          filter={mockFilter}
+          filterSetting={mockFilterSetting}
+          icon={MarkGithubIcon}
+          id={'FilterSectionTest'}
+          title={'FilterSectionTitle'}
+        />,
+        {
+          settings: {
+            ...mockSettings,
+            filterStates: ['open'],
+          },
+          updateFilter: mockUpdateFilter,
+        },
       );
     });
 
     await userEvent.click(screen.getByLabelText('Closed'));
 
-    expect(updateFilter).toHaveBeenCalledWith(
+    expect(mockUpdateFilter).toHaveBeenCalledWith(
       mockFilterSetting,
       'closed',
       true,
diff --git a/src/renderer/components/filters/ReasonFilter.test.tsx b/src/renderer/components/filters/ReasonFilter.test.tsx
index 81beb41ce..8267d14da 100644
--- a/src/renderer/components/filters/ReasonFilter.test.tsx
+++ b/src/renderer/components/filters/ReasonFilter.test.tsx
@@ -1,22 +1,12 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
 import { ReasonFilter } from './ReasonFilter';
 
 describe('renderer/components/filters/ReasonFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: mockSettings,
-          notifications: mockAccountNotifications,
-        }}
-      >
-        <ReasonFilter />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<ReasonFilter />, {
+      notifications: mockAccountNotifications,
+    });
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
index cd57cb5f8..1e9ff68de 100644
--- a/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
+++ b/src/renderer/components/filters/RequiresDetailedNotificationsWarning.test.tsx
@@ -1,22 +1,9 @@
-import { render } from '@testing-library/react';
-
-import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { RequiresDetailedNotificationWarning } from './RequiresDetailedNotificationsWarning';
 
 describe('renderer/components/filters/RequiresDetailedNotificationsWarning.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: mockSettings,
-          notifications: mockAccountNotifications,
-        }}
-      >
-        <RequiresDetailedNotificationWarning />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<RequiresDetailedNotificationWarning />);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/filters/SearchFilter.test.tsx b/src/renderer/components/filters/SearchFilter.test.tsx
index 2299ce16c..1ddb2791b 100644
--- a/src/renderer/components/filters/SearchFilter.test.tsx
+++ b/src/renderer/components/filters/SearchFilter.test.tsx
@@ -1,29 +1,26 @@
-import { fireEvent, render, screen } from '@testing-library/react';
+import { fireEvent, screen } from '@testing-library/react';
 
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { SearchFilter } from './SearchFilter';
 
-const updateFilter = jest.fn();
-
 describe('renderer/components/filters/SearchFilter.tsx', () => {
+  const mockUpdateFilter = jest.fn();
+
   afterEach(() => {
     jest.clearAllMocks();
   });
 
   describe('Include Search Tokens', () => {
     it('adds include actor token with prefix', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, { target: { value: 'author:octocat' } });
       fireEvent.keyDown(includeInput, { key: 'Enter' });
 
-      expect(updateFilter).toHaveBeenCalledWith(
+      expect(mockUpdateFilter).toHaveBeenCalledWith(
         'filterIncludeSearchTokens',
         'author:octocat',
         true,
@@ -31,17 +28,15 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds include org token with prefix', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, { target: { value: 'org:gitify-app' } });
       fireEvent.keyDown(includeInput, { key: 'Enter' });
 
-      expect(updateFilter).toHaveBeenCalledWith(
+      expect(mockUpdateFilter).toHaveBeenCalledWith(
         'filterIncludeSearchTokens',
         'org:gitify-app',
         true,
@@ -49,11 +44,9 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds include repo token with prefix', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, {
@@ -61,7 +54,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
       });
       fireEvent.keyDown(includeInput, { key: 'Enter' });
 
-      expect(updateFilter).toHaveBeenCalledWith(
+      expect(mockUpdateFilter).toHaveBeenCalledWith(
         'filterIncludeSearchTokens',
         'repo:gitify-app/gitify',
         true,
@@ -69,11 +62,9 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('prevent unrecognized include prefixes', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const includeInput = screen.getByTitle('Include searches');
       fireEvent.change(includeInput, {
@@ -81,23 +72,21 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
       });
       fireEvent.keyDown(includeInput, { key: 'Enter' });
 
-      expect(updateFilter).not.toHaveBeenCalledWith();
+      expect(mockUpdateFilter).not.toHaveBeenCalledWith();
     });
   });
 
   describe('Exclude Search Tokens', () => {
     it('adds exclude actor token with prefix', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const includeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(includeInput, { target: { value: 'author:octocat' } });
       fireEvent.keyDown(includeInput, { key: 'Enter' });
 
-      expect(updateFilter).toHaveBeenCalledWith(
+      expect(mockUpdateFilter).toHaveBeenCalledWith(
         'filterExcludeSearchTokens',
         'author:octocat',
         true,
@@ -105,17 +94,15 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds exclude org token with prefix', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const excludeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(excludeInput, { target: { value: 'org:gitify-app' } });
       fireEvent.keyDown(excludeInput, { key: 'Enter' });
 
-      expect(updateFilter).toHaveBeenCalledWith(
+      expect(mockUpdateFilter).toHaveBeenCalledWith(
         'filterExcludeSearchTokens',
         'org:gitify-app',
         true,
@@ -123,11 +110,9 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('adds exclude repo token with prefix', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const excludeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(excludeInput, {
@@ -135,7 +120,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
       });
       fireEvent.keyDown(excludeInput, { key: 'Enter' });
 
-      expect(updateFilter).toHaveBeenCalledWith(
+      expect(mockUpdateFilter).toHaveBeenCalledWith(
         'filterExcludeSearchTokens',
         'repo:gitify-app/gitify',
         true,
@@ -143,11 +128,9 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
     });
 
     it('prevent unrecognized exclude prefixes', () => {
-      render(
-        <AppContext.Provider value={{ settings: mockSettings, updateFilter }}>
-          <SearchFilter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SearchFilter />, {
+        updateFilter: mockUpdateFilter,
+      });
 
       const excludeInput = screen.getByTitle('Exclude searches');
       fireEvent.change(excludeInput, {
@@ -155,7 +138,7 @@ describe('renderer/components/filters/SearchFilter.tsx', () => {
       });
       fireEvent.keyDown(excludeInput, { key: 'Enter' });
 
-      expect(updateFilter).not.toHaveBeenCalledWith();
+      expect(mockUpdateFilter).not.toHaveBeenCalledWith();
     });
   });
 });
diff --git a/src/renderer/components/filters/SearchFilterSuggestions.test.tsx b/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
index 49faa8b3e..0671d1637 100644
--- a/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
+++ b/src/renderer/components/filters/SearchFilterSuggestions.test.tsx
@@ -1,91 +1,67 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
 import { SearchFilterSuggestions } from './SearchFilterSuggestions';
 
 describe('renderer/components/filters/SearchFilterSuggestions.tsx', () => {
   it('should render itself & its children - closed', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: false,
-          } as SettingsState,
-        }}
-      >
-        <SearchFilterSuggestions inputValue={''} open={false} />
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <SearchFilterSuggestions inputValue={''} open={false} />,
     );
 
     expect(tree).toMatchSnapshot();
   });
 
-  it('should render itself & its children - open', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: true,
-          } as SettingsState,
-        }}
-      >
-        <SearchFilterSuggestions inputValue={''} open={true} />
-      </AppContext.Provider>,
+  it('should render itself & its children - open without detailed notifications enabled', () => {
+    const tree = renderWithAppContext(
+      <SearchFilterSuggestions inputValue={''} open={true} />,
+      {
+        settings: {
+          ...mockSettings,
+          detailedNotifications: false,
+        },
+      },
     );
 
     expect(tree).toMatchSnapshot();
   });
 
-  it('should render itself & its children - open with detailed enabled', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: true,
-          } as SettingsState,
-        }}
-      >
-        <SearchFilterSuggestions inputValue={''} open={true} />
-      </AppContext.Provider>,
+  it('should render itself & its children - open with detailed notifications enabled', () => {
+    const tree = renderWithAppContext(
+      <SearchFilterSuggestions inputValue={''} open={true} />,
+      {
+        settings: {
+          ...mockSettings,
+          detailedNotifications: true,
+        },
+      },
     );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - input token invalid', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: false,
-          } as SettingsState,
-        }}
-      >
-        <SearchFilterSuggestions inputValue={'invalid'} open={true} />
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <SearchFilterSuggestions inputValue={'invalid'} open={true} />,
+      {
+        settings: {
+          ...mockSettings,
+          detailedNotifications: false,
+        },
+      },
     );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - input token valid', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: false,
-          } as SettingsState,
-        }}
-      >
-        <SearchFilterSuggestions inputValue={'repo:'} open={true} />
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <SearchFilterSuggestions inputValue={'repo:'} open={true} />,
+      {
+        settings: {
+          ...mockSettings,
+          detailedNotifications: false,
+        },
+      },
     );
 
     expect(tree).toMatchSnapshot();
diff --git a/src/renderer/components/filters/StateFilter.test.tsx b/src/renderer/components/filters/StateFilter.test.tsx
index a924580ac..fb9974a7b 100644
--- a/src/renderer/components/filters/StateFilter.test.tsx
+++ b/src/renderer/components/filters/StateFilter.test.tsx
@@ -1,26 +1,12 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
 import { StateFilter } from './StateFilter';
 
 describe('renderer/components/filters/StateFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: true,
-          } as SettingsState,
-          notifications: mockAccountNotifications,
-        }}
-      >
-        <StateFilter />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<StateFilter />, {
+      notifications: mockAccountNotifications,
+    });
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/filters/SubjectTypeFilter.test.tsx b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
index 1015df381..6105f02f9 100644
--- a/src/renderer/components/filters/SubjectTypeFilter.test.tsx
+++ b/src/renderer/components/filters/SubjectTypeFilter.test.tsx
@@ -1,25 +1,12 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
 import { SubjectTypeFilter } from './SubjectTypeFilter';
 
 describe('renderer/components/filters/SubjectTypeFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-          } as SettingsState,
-          notifications: mockAccountNotifications,
-        }}
-      >
-        <SubjectTypeFilter />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<SubjectTypeFilter />, {
+      notifications: mockAccountNotifications,
+    });
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/filters/UserTypeFilter.test.tsx b/src/renderer/components/filters/UserTypeFilter.test.tsx
index fa3009361..f582cf701 100644
--- a/src/renderer/components/filters/UserTypeFilter.test.tsx
+++ b/src/renderer/components/filters/UserTypeFilter.test.tsx
@@ -1,26 +1,12 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockAccountNotifications } from '../../__mocks__/notifications-mocks';
-import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import type { SettingsState } from '../../types';
 import { UserTypeFilter } from './UserTypeFilter';
 
 describe('renderer/components/filters/UserTypeFilter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          settings: {
-            ...mockSettings,
-            detailedNotifications: true,
-          } as SettingsState,
-          notifications: mockAccountNotifications,
-        }}
-      >
-        <UserTypeFilter />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<UserTypeFilter />, {
+      notifications: mockAccountNotifications,
+    });
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
index 089ad252c..256207e3a 100644
--- a/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/FilterSection.test.tsx.snap
@@ -458,539 +458,561 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <fieldset
-        id="FilterSectionTest"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <legend>
-          <div
-            class="mb-2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <fieldset
+            id="FilterSectionTest"
           >
+            <legend>
+              <div
+                class="mb-2"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-filtersectiontitle"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-mark-github"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    FilterSectionTitle
+                  </h4>
+                </div>
+              </div>
+            </legend>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
+              data-align="stretch"
+              data-direction="vertical"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="title-filtersectiontitle"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Closed"
+                  id="Closed"
+                  type="checkbox"
                 />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Closed"
+                >
+                  Closed
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Closed"
+                  data-testid="tooltip-tooltip-Closed"
+                  id="tooltip-Closed"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                FilterSectionTitle
-              </h4>
-            </div>
-          </div>
-        </legend>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
-            >
-              Closed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Draft"
+                  id="Draft"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Draft"
+                >
+                  Draft
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Merged"
+                  id="Merged"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Merged"
-              id="Merged"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Merged"
-            >
-              Merged
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
-            >
-              Open
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Merged"
+                >
+                  Merged
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Open"
+                  id="Open"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Other"
-              id="Other"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Other"
-            >
-              Other
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Other"
-              data-testid="tooltip-tooltip-Other"
-              id="tooltip-Other"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Open"
+                >
+                  Open
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Open"
+                  data-testid="tooltip-tooltip-Open"
+                  id="tooltip-Open"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Other"
+                  id="Other"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              3
-            </span>
-          </div>
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Other"
+                >
+                  Other
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Other"
+                  data-testid="tooltip-tooltip-Other"
+                  id="tooltip-Other"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  3
+                </span>
+              </div>
+            </div>
+          </fieldset>
         </div>
-      </fieldset>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <fieldset
-      id="FilterSectionTest"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <legend>
-        <div
-          class="mb-2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <fieldset
+          id="FilterSectionTest"
         >
+          <legend>
+            <div
+              class="mb-2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+                id="title-filtersectiontitle"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-mark-github"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                  />
+                </svg>
+                <h4
+                  class="prc-Heading-Heading-6CmGO"
+                >
+                  FilterSectionTitle
+                </h4>
+              </div>
+            </div>
+          </legend>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
+            data-align="stretch"
+            data-direction="vertical"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="title-filtersectiontitle"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-mark-github"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Closed"
+                id="Closed"
+                type="checkbox"
               />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Closed"
+              >
+                Closed
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Closed"
+                data-testid="tooltip-tooltip-Closed"
+                id="tooltip-Closed"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              FilterSectionTitle
-            </h4>
-          </div>
-        </div>
-      </legend>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Closed"
-            id="Closed"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Closed"
-          >
-            Closed
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Closed"
-            data-testid="tooltip-tooltip-Closed"
-            id="tooltip-Closed"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Draft"
+                id="Draft"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Draft"
+              >
+                Draft
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Merged"
+                id="Merged"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Draft"
-            id="Draft"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Draft"
-          >
-            Draft
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Merged"
-            id="Merged"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Merged"
-          >
-            Merged
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Open"
-            id="Open"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Open"
-          >
-            Open
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Open"
-            data-testid="tooltip-tooltip-Open"
-            id="tooltip-Open"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Merged"
+              >
+                Merged
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Open"
+                id="Open"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Other"
-            id="Other"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Other"
-          >
-            Other
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Other"
-            data-testid="tooltip-tooltip-Other"
-            id="tooltip-Other"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Open"
+              >
+                Open
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Open"
+                data-testid="tooltip-tooltip-Open"
+                id="tooltip-Open"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Other"
+                id="Other"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            3
-          </span>
-        </div>
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Other"
+              >
+                Other
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Other"
+                data-testid="tooltip-tooltip-Other"
+                id="tooltip-Other"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                3
+              </span>
+            </div>
+          </div>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -1051,539 +1073,561 @@ exports[`renderer/components/filters/FilterSection.tsx should render itself & it
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <fieldset
-        id="FilterSectionTest"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <legend>
-          <div
-            class="mb-2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <fieldset
+            id="FilterSectionTest"
           >
+            <legend>
+              <div
+                class="mb-2"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-filtersectiontitle"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-mark-github"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    FilterSectionTitle
+                  </h4>
+                </div>
+              </div>
+            </legend>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
+              data-align="stretch"
+              data-direction="vertical"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="title-filtersectiontitle"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-mark-github"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Closed"
+                  id="Closed"
+                  type="checkbox"
                 />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Closed"
+                >
+                  Closed
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Closed"
+                  data-testid="tooltip-tooltip-Closed"
+                  id="tooltip-Closed"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                FilterSectionTitle
-              </h4>
-            </div>
-          </div>
-        </legend>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
-            >
-              Closed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Draft"
+                  id="Draft"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Draft"
+                >
+                  Draft
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Merged"
+                  id="Merged"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Merged"
-              id="Merged"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Merged"
-            >
-              Merged
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
-            >
-              Open
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Merged"
+                >
+                  Merged
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Open"
+                  id="Open"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Other"
-              id="Other"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Other"
-            >
-              Other
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Other"
-              data-testid="tooltip-tooltip-Other"
-              id="tooltip-Other"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Open"
+                >
+                  Open
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Open"
+                  data-testid="tooltip-tooltip-Open"
+                  id="tooltip-Open"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Other"
+                  id="Other"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              3
-            </span>
-          </div>
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Other"
+                >
+                  Other
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Other"
+                  data-testid="tooltip-tooltip-Other"
+                  id="tooltip-Other"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  3
+                </span>
+              </div>
+            </div>
+          </fieldset>
         </div>
-      </fieldset>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <fieldset
-      id="FilterSectionTest"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <legend>
-        <div
-          class="mb-2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <fieldset
+          id="FilterSectionTest"
         >
+          <legend>
+            <div
+              class="mb-2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+                id="title-filtersectiontitle"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-mark-github"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                  />
+                </svg>
+                <h4
+                  class="prc-Heading-Heading-6CmGO"
+                >
+                  FilterSectionTitle
+                </h4>
+              </div>
+            </div>
+          </legend>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
+            data-align="stretch"
+            data-direction="vertical"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="title-filtersectiontitle"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-mark-github"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Closed"
+                id="Closed"
+                type="checkbox"
               />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Closed"
+              >
+                Closed
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Closed"
+                data-testid="tooltip-tooltip-Closed"
+                id="tooltip-Closed"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              FilterSectionTitle
-            </h4>
-          </div>
-        </div>
-      </legend>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Closed"
-            id="Closed"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Closed"
-          >
-            Closed
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Closed"
-            data-testid="tooltip-tooltip-Closed"
-            id="tooltip-Closed"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Draft"
+                id="Draft"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Draft"
+              >
+                Draft
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Merged"
+                id="Merged"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Draft"
-            id="Draft"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Draft"
-          >
-            Draft
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Merged"
-            id="Merged"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Merged"
-          >
-            Merged
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Open"
-            id="Open"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Open"
-          >
-            Open
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Open"
-            data-testid="tooltip-tooltip-Open"
-            id="tooltip-Open"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Merged"
+              >
+                Merged
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Open"
+                id="Open"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Other"
-            id="Other"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Other"
-          >
-            Other
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Other"
-            data-testid="tooltip-tooltip-Other"
-            id="tooltip-Other"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Open"
+              >
+                Open
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Open"
+                data-testid="tooltip-tooltip-Open"
+                id="tooltip-Open"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Other"
+                id="Other"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            3
-          </span>
-        </div>
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Other"
+              >
+                Other
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Other"
+                data-testid="tooltip-tooltip-Other"
+                id="tooltip-Other"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                3
+              </span>
+            </div>
+          </div>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
index fa2882829..bf54b0923 100644
--- a/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/ReasonFilter.test.tsx.snap
@@ -5,1755 +5,1777 @@ exports[`renderer/components/filters/ReasonFilter.tsx should render itself & its
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <fieldset
-        id="filter-reasons"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <legend>
-          <div
-            class="mb-2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <fieldset
+            id="filter-reasons"
           >
+            <legend>
+              <div
+                class="mb-2"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-reason"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-note"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    Reason
+                  </h4>
+                  <button
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    aria-label="tooltip-reason"
+                    data-testid="tooltip-tooltip-reason"
+                    id="tooltip-reason"
+                    tabindex="0"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-question text-gitify-tooltip-icon"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </div>
+            </legend>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
+              data-align="stretch"
+              data-direction="vertical"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="title-reason"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-note"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Approval Requested"
+                  id="Approval Requested"
+                  type="checkbox"
                 />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
-              >
-                Reason
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-reason"
-                data-testid="tooltip-tooltip-reason"
-                id="tooltip-reason"
-                tabindex="0"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-question text-gitify-tooltip-icon"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Approval Requested"
                 >
-                  <path
-                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                  />
-                </svg>
-              </button>
-            </div>
-          </div>
-        </legend>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Approval Requested"
-              id="Approval Requested"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Approval Requested"
-            >
-              Approval Requested
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Approval Requested"
-              data-testid="tooltip-tooltip-Approval Requested"
-              id="tooltip-Approval Requested"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Assigned"
-              id="Assigned"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Assigned"
-            >
-              Assigned
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Assigned"
-              data-testid="tooltip-tooltip-Assigned"
-              id="tooltip-Assigned"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                  Approval Requested
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Approval Requested"
+                  data-testid="tooltip-tooltip-Approval Requested"
+                  id="tooltip-Approval Requested"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Assigned"
+                  id="Assigned"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Authored"
-              id="Authored"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Authored"
-            >
-              Authored
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Authored"
-              data-testid="tooltip-tooltip-Authored"
-              id="tooltip-Authored"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Assigned"
+                >
+                  Assigned
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Assigned"
+                  data-testid="tooltip-tooltip-Assigned"
+                  id="tooltip-Assigned"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Authored"
+                  id="Authored"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Commented"
-              id="Commented"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Commented"
-            >
-              Commented
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Commented"
-              data-testid="tooltip-tooltip-Commented"
-              id="tooltip-Commented"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Authored"
+                >
+                  Authored
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Authored"
+                  data-testid="tooltip-tooltip-Authored"
+                  id="tooltip-Authored"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Commented"
+                  id="Commented"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation Received"
-              id="Invitation Received"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation Received"
-            >
-              Invitation Received
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Invitation Received"
-              data-testid="tooltip-tooltip-Invitation Received"
-              id="tooltip-Invitation Received"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Commented"
+                >
+                  Commented
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Commented"
+                  data-testid="tooltip-tooltip-Commented"
+                  id="tooltip-Commented"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Invitation Received"
+                  id="Invitation Received"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Member Feature Requested"
-              id="Member Feature Requested"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Member Feature Requested"
-            >
-              Member Feature Requested
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Member Feature Requested"
-              data-testid="tooltip-tooltip-Member Feature Requested"
-              id="tooltip-Member Feature Requested"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Invitation Received"
+                >
+                  Invitation Received
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Invitation Received"
+                  data-testid="tooltip-tooltip-Invitation Received"
+                  id="tooltip-Invitation Received"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Member Feature Requested"
+                  id="Member Feature Requested"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Mentioned"
-              id="Mentioned"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Mentioned"
-            >
-              Mentioned
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Mentioned"
-              data-testid="tooltip-tooltip-Mentioned"
-              id="tooltip-Mentioned"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Member Feature Requested"
+                >
+                  Member Feature Requested
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Member Feature Requested"
+                  data-testid="tooltip-tooltip-Member Feature Requested"
+                  id="tooltip-Member Feature Requested"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Mentioned"
+                  id="Mentioned"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Review Requested"
-              id="Review Requested"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Review Requested"
-            >
-              Review Requested
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Review Requested"
-              data-testid="tooltip-tooltip-Review Requested"
-              id="tooltip-Review Requested"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Mentioned"
+                >
+                  Mentioned
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Mentioned"
+                  data-testid="tooltip-tooltip-Mentioned"
+                  id="tooltip-Mentioned"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Review Requested"
+                  id="Review Requested"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Advisory Credit Received"
-              id="Security Advisory Credit Received"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Security Advisory Credit Received"
-            >
-              Security Advisory Credit Received
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Security Advisory Credit Received"
-              data-testid="tooltip-tooltip-Security Advisory Credit Received"
-              id="tooltip-Security Advisory Credit Received"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Review Requested"
+                >
+                  Review Requested
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Review Requested"
+                  data-testid="tooltip-tooltip-Review Requested"
+                  id="tooltip-Review Requested"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Security Advisory Credit Received"
+                  id="Security Advisory Credit Received"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Security Alert Received"
-              id="Security Alert Received"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Security Alert Received"
-            >
-              Security Alert Received
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Security Alert Received"
-              data-testid="tooltip-tooltip-Security Alert Received"
-              id="tooltip-Security Alert Received"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Security Advisory Credit Received"
+                >
+                  Security Advisory Credit Received
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Security Advisory Credit Received"
+                  data-testid="tooltip-tooltip-Security Advisory Credit Received"
+                  id="tooltip-Security Advisory Credit Received"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Security Alert Received"
+                  id="Security Alert Received"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-State Changed"
-              id="State Changed"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="State Changed"
-            >
-              State Changed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-State Changed"
-              data-testid="tooltip-tooltip-State Changed"
-              id="tooltip-State Changed"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Security Alert Received"
+                >
+                  Security Alert Received
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Security Alert Received"
+                  data-testid="tooltip-tooltip-Security Alert Received"
+                  id="tooltip-Security Alert Received"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-State Changed"
+                  id="State Changed"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Team Mentioned"
-              id="Team Mentioned"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Team Mentioned"
-            >
-              Team Mentioned
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Team Mentioned"
-              data-testid="tooltip-tooltip-Team Mentioned"
-              id="tooltip-Team Mentioned"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="State Changed"
+                >
+                  State Changed
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-State Changed"
+                  data-testid="tooltip-tooltip-State Changed"
+                  id="tooltip-State Changed"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Team Mentioned"
+                  id="Team Mentioned"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Updated"
-              id="Updated"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Updated"
-            >
-              Updated
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Updated"
-              data-testid="tooltip-tooltip-Updated"
-              id="tooltip-Updated"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Team Mentioned"
+                >
+                  Team Mentioned
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Team Mentioned"
+                  data-testid="tooltip-tooltip-Team Mentioned"
+                  id="tooltip-Team Mentioned"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Updated"
+                  id="Updated"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Updated"
-              id="Updated"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Updated"
-            >
-              Updated
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Updated"
-              data-testid="tooltip-tooltip-Updated"
-              id="tooltip-Updated"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Updated"
+                >
+                  Updated
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Updated"
+                  data-testid="tooltip-tooltip-Updated"
+                  id="tooltip-Updated"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Updated"
+                  id="Updated"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              3
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Workflow Run Completed"
-              id="Workflow Run Completed"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Workflow Run Completed"
-            >
-              Workflow Run Completed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Workflow Run Completed"
-              data-testid="tooltip-tooltip-Workflow Run Completed"
-              id="tooltip-Workflow Run Completed"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Updated"
+                >
+                  Updated
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Updated"
+                  data-testid="tooltip-tooltip-Updated"
+                  id="tooltip-Updated"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  3
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Workflow Run Completed"
+                  id="Workflow Run Completed"
+                  type="checkbox"
                 />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Workflow Run Completed"
+                >
+                  Workflow Run Completed
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Workflow Run Completed"
+                  data-testid="tooltip-tooltip-Workflow Run Completed"
+                  id="tooltip-Workflow Run Completed"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+            </div>
+          </fieldset>
         </div>
-      </fieldset>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <fieldset
-      id="filter-reasons"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <legend>
-        <div
-          class="mb-2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <fieldset
+          id="filter-reasons"
         >
+          <legend>
+            <div
+              class="mb-2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+                id="title-reason"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-note"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
+                  />
+                </svg>
+                <h4
+                  class="prc-Heading-Heading-6CmGO"
+                >
+                  Reason
+                </h4>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-reason"
+                  data-testid="tooltip-tooltip-reason"
+                  id="tooltip-reason"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+              </div>
+            </div>
+          </legend>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
+            data-align="stretch"
+            data-direction="vertical"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
-            id="title-reason"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-note"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 3.75C0 2.784.784 2 1.75 2h12.5c.966 0 1.75.784 1.75 1.75v8.5A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25Zm1.75-.25a.25.25 0 0 0-.25.25v8.5c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-8.5a.25.25 0 0 0-.25-.25ZM3.5 6.25a.75.75 0 0 1 .75-.75h7a.75.75 0 0 1 0 1.5h-7a.75.75 0 0 1-.75-.75Zm.75 2.25h4a.75.75 0 0 1 0 1.5h-4a.75.75 0 0 1 0-1.5Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
-            >
-              Reason
-            </h4>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-reason"
-              data-testid="tooltip-tooltip-reason"
-              id="tooltip-reason"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-          </div>
-        </div>
-      </legend>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Approval Requested"
-            id="Approval Requested"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Approval Requested"
-          >
-            Approval Requested
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Approval Requested"
-            data-testid="tooltip-tooltip-Approval Requested"
-            id="tooltip-Approval Requested"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Approval Requested"
+                id="Approval Requested"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Assigned"
-            id="Assigned"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Assigned"
-          >
-            Assigned
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Assigned"
-            data-testid="tooltip-tooltip-Assigned"
-            id="tooltip-Assigned"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Approval Requested"
+              >
+                Approval Requested
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Approval Requested"
+                data-testid="tooltip-tooltip-Approval Requested"
+                id="tooltip-Approval Requested"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Assigned"
+                id="Assigned"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Authored"
-            id="Authored"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Authored"
-          >
-            Authored
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Authored"
-            data-testid="tooltip-tooltip-Authored"
-            id="tooltip-Authored"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Assigned"
+              >
+                Assigned
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Assigned"
+                data-testid="tooltip-tooltip-Assigned"
+                id="tooltip-Assigned"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Authored"
+                id="Authored"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Commented"
-            id="Commented"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Commented"
-          >
-            Commented
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Commented"
-            data-testid="tooltip-tooltip-Commented"
-            id="tooltip-Commented"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Authored"
+              >
+                Authored
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Authored"
+                data-testid="tooltip-tooltip-Authored"
+                id="tooltip-Authored"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Commented"
+                id="Commented"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Invitation Received"
-            id="Invitation Received"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Invitation Received"
-          >
-            Invitation Received
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Invitation Received"
-            data-testid="tooltip-tooltip-Invitation Received"
-            id="tooltip-Invitation Received"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Commented"
+              >
+                Commented
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Commented"
+                data-testid="tooltip-tooltip-Commented"
+                id="tooltip-Commented"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Invitation Received"
+                id="Invitation Received"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Member Feature Requested"
-            id="Member Feature Requested"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Member Feature Requested"
-          >
-            Member Feature Requested
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Member Feature Requested"
-            data-testid="tooltip-tooltip-Member Feature Requested"
-            id="tooltip-Member Feature Requested"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Invitation Received"
+              >
+                Invitation Received
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Invitation Received"
+                data-testid="tooltip-tooltip-Invitation Received"
+                id="tooltip-Invitation Received"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Member Feature Requested"
+                id="Member Feature Requested"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Mentioned"
-            id="Mentioned"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Mentioned"
-          >
-            Mentioned
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Mentioned"
-            data-testid="tooltip-tooltip-Mentioned"
-            id="tooltip-Mentioned"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Member Feature Requested"
+              >
+                Member Feature Requested
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Member Feature Requested"
+                data-testid="tooltip-tooltip-Member Feature Requested"
+                id="tooltip-Member Feature Requested"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Mentioned"
+                id="Mentioned"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Review Requested"
-            id="Review Requested"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Review Requested"
-          >
-            Review Requested
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Review Requested"
-            data-testid="tooltip-tooltip-Review Requested"
-            id="tooltip-Review Requested"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Mentioned"
+              >
+                Mentioned
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Mentioned"
+                data-testid="tooltip-tooltip-Mentioned"
+                id="tooltip-Mentioned"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Review Requested"
+                id="Review Requested"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Security Advisory Credit Received"
-            id="Security Advisory Credit Received"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Security Advisory Credit Received"
-          >
-            Security Advisory Credit Received
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Security Advisory Credit Received"
-            data-testid="tooltip-tooltip-Security Advisory Credit Received"
-            id="tooltip-Security Advisory Credit Received"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Review Requested"
+              >
+                Review Requested
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Review Requested"
+                data-testid="tooltip-tooltip-Review Requested"
+                id="tooltip-Review Requested"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Security Advisory Credit Received"
+                id="Security Advisory Credit Received"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Security Alert Received"
-            id="Security Alert Received"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Security Alert Received"
-          >
-            Security Alert Received
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Security Alert Received"
-            data-testid="tooltip-tooltip-Security Alert Received"
-            id="tooltip-Security Alert Received"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Security Advisory Credit Received"
+              >
+                Security Advisory Credit Received
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Security Advisory Credit Received"
+                data-testid="tooltip-tooltip-Security Advisory Credit Received"
+                id="tooltip-Security Advisory Credit Received"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Security Alert Received"
+                id="Security Alert Received"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-State Changed"
-            id="State Changed"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="State Changed"
-          >
-            State Changed
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-State Changed"
-            data-testid="tooltip-tooltip-State Changed"
-            id="tooltip-State Changed"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Security Alert Received"
+              >
+                Security Alert Received
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Security Alert Received"
+                data-testid="tooltip-tooltip-Security Alert Received"
+                id="tooltip-Security Alert Received"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-State Changed"
+                id="State Changed"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Team Mentioned"
-            id="Team Mentioned"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Team Mentioned"
-          >
-            Team Mentioned
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Team Mentioned"
-            data-testid="tooltip-tooltip-Team Mentioned"
-            id="tooltip-Team Mentioned"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="State Changed"
+              >
+                State Changed
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-State Changed"
+                data-testid="tooltip-tooltip-State Changed"
+                id="tooltip-State Changed"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Team Mentioned"
+                id="Team Mentioned"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Updated"
-            id="Updated"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Updated"
-          >
-            Updated
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Updated"
-            data-testid="tooltip-tooltip-Updated"
-            id="tooltip-Updated"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Team Mentioned"
+              >
+                Team Mentioned
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Team Mentioned"
+                data-testid="tooltip-tooltip-Team Mentioned"
+                id="tooltip-Team Mentioned"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Updated"
+                id="Updated"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Updated"
-            id="Updated"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Updated"
-          >
-            Updated
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Updated"
-            data-testid="tooltip-tooltip-Updated"
-            id="tooltip-Updated"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Updated"
+              >
+                Updated
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Updated"
+                data-testid="tooltip-tooltip-Updated"
+                id="tooltip-Updated"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Updated"
+                id="Updated"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            3
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Workflow Run Completed"
-            id="Workflow Run Completed"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Workflow Run Completed"
-          >
-            Workflow Run Completed
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Workflow Run Completed"
-            data-testid="tooltip-tooltip-Workflow Run Completed"
-            id="tooltip-Workflow Run Completed"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Updated"
+              >
+                Updated
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Updated"
+                data-testid="tooltip-tooltip-Updated"
+                id="tooltip-Updated"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                3
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Workflow Run Completed"
+                id="Workflow Run Completed"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Workflow Run Completed"
+              >
+                Workflow Run Completed
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Workflow Run Completed"
+                data-testid="tooltip-tooltip-Workflow Run Completed"
+                id="tooltip-Workflow Run Completed"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+          </div>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap b/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap
index fa47e974f..8bcb0d895 100644
--- a/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/RequiresDetailedNotificationsWarning.test.tsx.snap
@@ -5,33 +5,55 @@ exports[`renderer/components/filters/RequiresDetailedNotificationsWarning.tsx sh
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <span
-        class="text-gitify-caution prc-Text-Text-0ima0"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        ⚠️ This filter requires the 
-        <strong
-          class="prc-Text-Text-0ima0"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          Detailed Notifications
-        </strong>
-         
-        setting to be enabled.
-      </span>
+          <span
+            class="text-gitify-caution prc-Text-Text-0ima0"
+          >
+            ⚠️ This filter requires the 
+            <strong
+              class="prc-Text-Text-0ima0"
+            >
+              Detailed Notifications
+            </strong>
+             
+            setting to be enabled.
+          </span>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <span
-      class="text-gitify-caution prc-Text-Text-0ima0"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      ⚠️ This filter requires the 
-      <strong
-        class="prc-Text-Text-0ima0"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        Detailed Notifications
-      </strong>
-       
-      setting to be enabled.
-    </span>
+        <span
+          class="text-gitify-caution prc-Text-Text-0ima0"
+        >
+          ⚠️ This filter requires the 
+          <strong
+            class="prc-Text-Text-0ima0"
+          >
+            Detailed Notifications
+          </strong>
+           
+          setting to be enabled.
+        </span>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
index 0c72c3a55..1285a2a14 100644
--- a/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SearchFilterSuggestions.test.tsx.snap
@@ -4,9 +4,31 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
 {
   "asFragment": [Function],
   "baseElement": <body>
-    <div />
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        />
+      </div>
+    </div>
   </body>,
-  "container": <div />,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      />
+    </div>
+  </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
   "findAllByDisplayValue": [Function],
@@ -67,32 +89,43 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
   "baseElement": <body>
     <div>
       <div
-        class="prc-Popover-Popover-v1ShS"
-        data-caret="top-left"
-        data-open=""
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-          data-height="auto"
-          data-width="auto"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="prc-Popover-Popover-v1ShS"
+            data-caret="top-left"
+            data-open=""
           >
-            <div>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
+            <div
+              class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+              data-height="auto"
+              data-width="auto"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                Please use one of the supported filters [
-                org, repo
-                ]
-              </span>
+                <div>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    Please use one of the supported filters [
+                    org, repo
+                    ]
+                  </span>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -101,32 +134,43 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
   </body>,
   "container": <div>
     <div
-      class="prc-Popover-Popover-v1ShS"
-      data-caret="top-left"
-      data-open=""
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-        data-height="auto"
-        data-width="auto"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-Popover-Popover-v1ShS"
+          data-caret="top-left"
+          data-open=""
         >
-          <div>
-            <span
-              class="text-xs opacity-90 prc-Text-Text-0ima0"
+          <div
+            class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+            data-height="auto"
+            data-width="auto"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              Please use one of the supported filters [
-              org, repo
-              ]
-            </span>
+              <div>
+                <span
+                  class="text-xs opacity-90 prc-Text-Text-0ima0"
+                >
+                  Please use one of the supported filters [
+                  org, repo
+                  ]
+                </span>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -192,44 +236,55 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
   "baseElement": <body>
     <div>
       <div
-        class="prc-Popover-Popover-v1ShS"
-        data-caret="top-left"
-        data-open=""
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-          data-height="auto"
-          data-width="auto"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="prc-Popover-Popover-v1ShS"
+            data-caret="top-left"
+            data-open=""
           >
-            <div>
+            <div
+              class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+              data-height="auto"
+              data-width="auto"
+            >
               <div
                 class="prc-Stack-Stack-WJVsK"
                 data-align="stretch"
                 data-direction="vertical"
-                data-gap="none"
+                data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  repo:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by repository full name
-                </span>
+                <div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="vertical"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="text-xs font-semibold prc-Text-Text-0ima0"
+                    >
+                      repo:
+                    </span>
+                    <span
+                      class="text-xs opacity-90 prc-Text-Text-0ima0"
+                    >
+                      filter by repository full name
+                    </span>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -239,44 +294,55 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
   </body>,
   "container": <div>
     <div
-      class="prc-Popover-Popover-v1ShS"
-      data-caret="top-left"
-      data-open=""
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-        data-height="auto"
-        data-width="auto"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-Popover-Popover-v1ShS"
+          data-caret="top-left"
+          data-open=""
         >
-          <div>
+          <div
+            class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+            data-height="auto"
+            data-width="auto"
+          >
             <div
               class="prc-Stack-Stack-WJVsK"
               data-align="stretch"
               data-direction="vertical"
-              data-gap="none"
+              data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                repo:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by repository full name
-              </span>
+              <div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="text-xs font-semibold prc-Text-Text-0ima0"
+                  >
+                    repo:
+                  </span>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    filter by repository full name
+                  </span>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -337,94 +403,105 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
 }
 `;
 
-exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - open 1`] = `
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - open with detailed notifications enabled 1`] = `
 {
   "asFragment": [Function],
   "baseElement": <body>
     <div>
       <div
-        class="prc-Popover-Popover-v1ShS"
-        data-caret="top-left"
-        data-open=""
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-          data-height="auto"
-          data-width="auto"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="prc-Popover-Popover-v1ShS"
+            data-caret="top-left"
+            data-open=""
           >
-            <div>
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  author:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by notification author
-                </span>
-              </div>
-            </div>
-            <div>
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  org:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by organization owner
-                </span>
-              </div>
-            </div>
-            <div>
+            <div
+              class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+              data-height="auto"
+              data-width="auto"
+            >
               <div
                 class="prc-Stack-Stack-WJVsK"
                 data-align="stretch"
                 data-direction="vertical"
-                data-gap="none"
+                data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  repo:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by repository full name
-                </span>
+                <div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="vertical"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="text-xs font-semibold prc-Text-Text-0ima0"
+                    >
+                      author:
+                    </span>
+                    <span
+                      class="text-xs opacity-90 prc-Text-Text-0ima0"
+                    >
+                      filter by notification author
+                    </span>
+                  </div>
+                </div>
+                <div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="vertical"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="text-xs font-semibold prc-Text-Text-0ima0"
+                    >
+                      org:
+                    </span>
+                    <span
+                      class="text-xs opacity-90 prc-Text-Text-0ima0"
+                    >
+                      filter by organization owner
+                    </span>
+                  </div>
+                </div>
+                <div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="vertical"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="text-xs font-semibold prc-Text-Text-0ima0"
+                    >
+                      repo:
+                    </span>
+                    <span
+                      class="text-xs opacity-90 prc-Text-Text-0ima0"
+                    >
+                      filter by repository full name
+                    </span>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -434,88 +511,99 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
   </body>,
   "container": <div>
     <div
-      class="prc-Popover-Popover-v1ShS"
-      data-caret="top-left"
-      data-open=""
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-        data-height="auto"
-        data-width="auto"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-Popover-Popover-v1ShS"
+          data-caret="top-left"
+          data-open=""
         >
-          <div>
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                author:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by notification author
-              </span>
-            </div>
-          </div>
-          <div>
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                org:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by organization owner
-              </span>
-            </div>
-          </div>
-          <div>
+          <div
+            class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+            data-height="auto"
+            data-width="auto"
+          >
             <div
               class="prc-Stack-Stack-WJVsK"
               data-align="stretch"
               data-direction="vertical"
-              data-gap="none"
+              data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                repo:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by repository full name
-              </span>
+              <div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="text-xs font-semibold prc-Text-Text-0ima0"
+                  >
+                    author:
+                  </span>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    filter by notification author
+                  </span>
+                </div>
+              </div>
+              <div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="text-xs font-semibold prc-Text-Text-0ima0"
+                  >
+                    org:
+                  </span>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    filter by organization owner
+                  </span>
+                </div>
+              </div>
+              <div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="text-xs font-semibold prc-Text-Text-0ima0"
+                  >
+                    repo:
+                  </span>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    filter by repository full name
+                  </span>
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -576,94 +664,83 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
 }
 `;
 
-exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - open with detailed enabled 1`] = `
+exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render itself & its children - open without detailed notifications enabled 1`] = `
 {
   "asFragment": [Function],
   "baseElement": <body>
     <div>
       <div
-        class="prc-Popover-Popover-v1ShS"
-        data-caret="top-left"
-        data-open=""
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-          data-height="auto"
-          data-width="auto"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="prc-Popover-Popover-v1ShS"
+            data-caret="top-left"
+            data-open=""
           >
-            <div>
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  author:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by notification author
-                </span>
-              </div>
-            </div>
-            <div>
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="stretch"
-                data-direction="vertical"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  org:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by organization owner
-                </span>
-              </div>
-            </div>
-            <div>
+            <div
+              class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+              data-height="auto"
+              data-width="auto"
+            >
               <div
                 class="prc-Stack-Stack-WJVsK"
                 data-align="stretch"
                 data-direction="vertical"
-                data-gap="none"
+                data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="text-xs font-semibold prc-Text-Text-0ima0"
-                >
-                  repo:
-                </span>
-                <span
-                  class="text-xs opacity-90 prc-Text-Text-0ima0"
-                >
-                  filter by repository full name
-                </span>
+                <div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="vertical"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="text-xs font-semibold prc-Text-Text-0ima0"
+                    >
+                      org:
+                    </span>
+                    <span
+                      class="text-xs opacity-90 prc-Text-Text-0ima0"
+                    >
+                      filter by organization owner
+                    </span>
+                  </div>
+                </div>
+                <div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="vertical"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="text-xs font-semibold prc-Text-Text-0ima0"
+                    >
+                      repo:
+                    </span>
+                    <span
+                      class="text-xs opacity-90 prc-Text-Text-0ima0"
+                    >
+                      filter by repository full name
+                    </span>
+                  </div>
+                </div>
               </div>
             </div>
           </div>
@@ -673,88 +750,77 @@ exports[`renderer/components/filters/SearchFilterSuggestions.tsx should render i
   </body>,
   "container": <div>
     <div
-      class="prc-Popover-Popover-v1ShS"
-      data-caret="top-left"
-      data-open=""
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
-        data-height="auto"
-        data-width="auto"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-Popover-Popover-v1ShS"
+          data-caret="top-left"
+          data-open=""
         >
-          <div>
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                author:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by notification author
-              </span>
-            </div>
-          </div>
-          <div>
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                org:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by organization owner
-              </span>
-            </div>
-          </div>
-          <div>
+          <div
+            class="p-2 mt-2 prc-Popover-PopoverContent-nMzFS"
+            data-height="auto"
+            data-width="auto"
+          >
             <div
               class="prc-Stack-Stack-WJVsK"
               data-align="stretch"
               data-direction="vertical"
-              data-gap="none"
+              data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="text-xs font-semibold prc-Text-Text-0ima0"
-              >
-                repo:
-              </span>
-              <span
-                class="text-xs opacity-90 prc-Text-Text-0ima0"
-              >
-                filter by repository full name
-              </span>
+              <div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="text-xs font-semibold prc-Text-Text-0ima0"
+                  >
+                    org:
+                  </span>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    filter by organization owner
+                  </span>
+                </div>
+              </div>
+              <div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="text-xs font-semibold prc-Text-Text-0ima0"
+                  >
+                    repo:
+                  </span>
+                  <span
+                    class="text-xs opacity-90 prc-Text-Text-0ima0"
+                  >
+                    filter by repository full name
+                  </span>
+                </div>
+              </div>
             </div>
           </div>
         </div>
diff --git a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
index 2be84f3d9..049ef2dfd 100644
--- a/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/StateFilter.test.tsx.snap
@@ -5,59 +5,343 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <fieldset
-        id="filter-state"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <legend>
-          <div
-            class="mb-2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <fieldset
+            id="filter-state"
           >
+            <legend>
+              <div
+                class="mb-2"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-state"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    State
+                  </h4>
+                  <button
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    aria-label="tooltip-state"
+                    data-testid="tooltip-tooltip-state"
+                    id="tooltip-state"
+                    tabindex="0"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-question text-gitify-tooltip-icon"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </div>
+            </legend>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
+              data-align="stretch"
+              data-direction="vertical"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="title-state"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Closed"
+                  id="Closed"
+                  type="checkbox"
                 />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Closed"
+                >
+                  Closed
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Closed"
+                  data-testid="tooltip-tooltip-Closed"
+                  id="tooltip-Closed"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Draft"
+                  id="Draft"
+                  type="checkbox"
                 />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Draft"
+                >
+                  Draft
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                State
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-state"
-                data-testid="tooltip-tooltip-state"
-                id="tooltip-state"
-                tabindex="0"
-                type="button"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Merged"
+                  id="Merged"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Merged"
+                >
+                  Merged
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Open"
+                  id="Open"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Open"
+                >
+                  Open
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Open"
+                  data-testid="tooltip-tooltip-Open"
+                  id="tooltip-Open"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Other"
+                  id="Other"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Other"
+                >
+                  Other
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Other"
+                  data-testid="tooltip-tooltip-Other"
+                  id="tooltip-Other"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  3
+                </span>
+              </div>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <fieldset
+          id="filter-state"
+        >
+          <legend>
+            <div
+              class="mb-2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+                id="title-state"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  class="octicon octicon-issue-opened"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -68,534 +352,272 @@ exports[`renderer/components/filters/StateFilter.tsx should render itself & its
                   width="16"
                 >
                   <path
-                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                   />
                 </svg>
-              </button>
+                <h4
+                  class="prc-Heading-Heading-6CmGO"
+                >
+                  State
+                </h4>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-state"
+                  data-testid="tooltip-tooltip-state"
+                  id="tooltip-state"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+              </div>
             </div>
-          </div>
-        </legend>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
+          </legend>
           <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="vertical"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Closed"
-              id="Closed"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Closed"
-            >
-              Closed
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Closed"
-              data-testid="tooltip-tooltip-Closed"
-              id="tooltip-Closed"
-              tabindex="0"
-              type="button"
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Closed"
+                id="Closed"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Closed"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Draft"
-              id="Draft"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Draft"
-            >
-              Draft
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Merged"
-              id="Merged"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Merged"
-            >
-              Merged
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Open"
-              id="Open"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Open"
-            >
-              Open
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Open"
-              data-testid="tooltip-tooltip-Open"
-              id="tooltip-Open"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                Closed
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Closed"
+                data-testid="tooltip-tooltip-Closed"
+                id="tooltip-Closed"
+                tabindex="0"
+                type="button"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Other"
-              id="Other"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Other"
-            >
-              Other
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Other"
-              data-testid="tooltip-tooltip-Other"
-              id="tooltip-Other"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              3
-            </span>
-          </div>
-        </div>
-      </fieldset>
-    </div>
-  </body>,
-  "container": <div>
-    <fieldset
-      id="filter-state"
-    >
-      <legend>
-        <div
-          class="mb-2"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-state"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Draft"
+                id="Draft"
+                type="checkbox"
               />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
-            >
-              State
-            </h4>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-state"
-              data-testid="tooltip-tooltip-state"
-              id="tooltip-state"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Draft"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-          </div>
-        </div>
-      </legend>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Closed"
-            id="Closed"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Closed"
-          >
-            Closed
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Closed"
-            data-testid="tooltip-tooltip-Closed"
-            id="tooltip-Closed"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+                Draft
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Merged"
+                id="Merged"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Draft"
-            id="Draft"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Draft"
-          >
-            Draft
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Merged"
-            id="Merged"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Merged"
-          >
-            Merged
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Open"
-            id="Open"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Open"
-          >
-            Open
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Open"
-            data-testid="tooltip-tooltip-Open"
-            id="tooltip-Open"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Merged"
+              >
+                Merged
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Open"
+                id="Open"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Other"
-            id="Other"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Other"
-          >
-            Other
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Other"
-            data-testid="tooltip-tooltip-Other"
-            id="tooltip-Other"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Open"
+              >
+                Open
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Open"
+                data-testid="tooltip-tooltip-Open"
+                id="tooltip-Open"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Other"
+                id="Other"
+                type="checkbox"
               />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            3
-          </span>
-        </div>
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Other"
+              >
+                Other
+              </label>
+              <button
+                aria-expanded="false"
+                aria-haspopup="true"
+                aria-label="tooltip-Other"
+                data-testid="tooltip-tooltip-Other"
+                id="tooltip-Other"
+                tabindex="0"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                3
+              </span>
+            </div>
+          </div>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
index 5d17d9770..16eb2ef0a 100644
--- a/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/SubjectTypeFilter.test.tsx.snap
@@ -5,56 +5,397 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <fieldset
-        id="filter-subject-type"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <legend>
-          <div
-            class="mb-2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <fieldset
+            id="filter-subject-type"
           >
+            <legend>
+              <div
+                class="mb-2"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-type"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-bell"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    Type
+                  </h4>
+                  <button
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    aria-label="tooltip-type"
+                    data-testid="tooltip-tooltip-type"
+                    id="tooltip-type"
+                    tabindex="0"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-question text-gitify-tooltip-icon"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </div>
+            </legend>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
+              data-align="stretch"
+              data-direction="vertical"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="title-type"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-bell"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Check Suite"
+                  id="Check Suite"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Check Suite"
+                >
+                  Check Suite
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Commit"
+                  id="Commit"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Commit"
+                >
+                  Commit
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Dependabot Alert"
+                  id="Dependabot Alert"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Dependabot Alert"
+                >
+                  Dependabot Alert
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Discussion"
+                  id="Discussion"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Discussion"
+                >
+                  Discussion
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Invitation"
+                  id="Invitation"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Invitation"
+                >
+                  Invitation
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Issue"
+                  id="Issue"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Issue"
+                >
+                  Issue
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Pull Request"
+                  id="Pull Request"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Pull Request"
+                >
+                  Pull Request
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Release"
+                  id="Release"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Release"
+                >
+                  Release
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Vulnerability Alert"
+                  id="Vulnerability Alert"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Vulnerability Alert"
+                >
+                  Vulnerability Alert
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Workflow Run"
+                  id="Workflow Run"
+                  type="checkbox"
                 />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
-              >
-                Type
-              </h4>
-              <button
-                aria-expanded="false"
-                aria-haspopup="true"
-                aria-label="tooltip-type"
-                data-testid="tooltip-tooltip-type"
-                id="tooltip-type"
-                tabindex="0"
-                type="button"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Workflow Run"
+                >
+                  Workflow Run
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <fieldset
+          id="filter-subject-type"
+        >
+          <legend>
+            <div
+              class="mb-2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+                id="title-type"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-question text-gitify-tooltip-icon"
+                  class="octicon octicon-bell"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -65,645 +406,326 @@ exports[`renderer/components/filters/SubjectTypeFilter.tsx should render itself
                   width="16"
                 >
                   <path
-                    d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
                   />
                 </svg>
-              </button>
+                <h4
+                  class="prc-Heading-Heading-6CmGO"
+                >
+                  Type
+                </h4>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-type"
+                  data-testid="tooltip-tooltip-type"
+                  id="tooltip-type"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+              </div>
             </div>
-          </div>
-        </legend>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Check Suite"
-              id="Check Suite"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Check Suite"
-            >
-              Check Suite
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Commit"
-              id="Commit"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Commit"
-            >
-              Commit
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Dependabot Alert"
-              id="Dependabot Alert"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Dependabot Alert"
-            >
-              Dependabot Alert
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Discussion"
-              id="Discussion"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Discussion"
-            >
-              Discussion
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
+          </legend>
           <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Invitation"
-              id="Invitation"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Invitation"
-            >
-              Invitation
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Issue"
-              id="Issue"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Issue"
-            >
-              Issue
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              2
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="vertical"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Pull Request"
-              id="Pull Request"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Pull Request"
-            >
-              Pull Request
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Release"
-              id="Release"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Release"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Check Suite"
+                id="Check Suite"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Check Suite"
+              >
+                Check Suite
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              Release
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Commit"
+                id="Commit"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Commit"
+              >
+                Commit
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              1
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Vulnerability Alert"
-              id="Vulnerability Alert"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Vulnerability Alert"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Dependabot Alert"
+                id="Dependabot Alert"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Dependabot Alert"
+              >
+                Dependabot Alert
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              Vulnerability Alert
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Discussion"
+                id="Discussion"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Discussion"
+              >
+                Discussion
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Workflow Run"
-              id="Workflow Run"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Workflow Run"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Invitation"
+                id="Invitation"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Invitation"
+              >
+                Invitation
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              Workflow Run
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Issue"
+                id="Issue"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Issue"
+              >
+                Issue
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              0
-            </span>
-          </div>
-        </div>
-      </fieldset>
-    </div>
-  </body>,
-  "container": <div>
-    <fieldset
-      id="filter-subject-type"
-    >
-      <legend>
-        <div
-          class="mb-2"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-type"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Pull Request"
+                id="Pull Request"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Pull Request"
+              >
+                Pull Request
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Release"
+                id="Release"
+                type="checkbox"
               />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Release"
+              >
+                Release
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              Type
-            </h4>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-type"
-              data-testid="tooltip-tooltip-type"
-              id="tooltip-type"
-              tabindex="0"
-              type="button"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Vulnerability Alert"
+                id="Vulnerability Alert"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Vulnerability Alert"
+              >
+                Vulnerability Alert
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Workflow Run"
+                id="Workflow Run"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Workflow Run"
+              >
+                Workflow Run
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
           </div>
-        </div>
-      </legend>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Check Suite"
-            id="Check Suite"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Check Suite"
-          >
-            Check Suite
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Commit"
-            id="Commit"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Commit"
-          >
-            Commit
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Dependabot Alert"
-            id="Dependabot Alert"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Dependabot Alert"
-          >
-            Dependabot Alert
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Discussion"
-            id="Discussion"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Discussion"
-          >
-            Discussion
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Invitation"
-            id="Invitation"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Invitation"
-          >
-            Invitation
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Issue"
-            id="Issue"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Issue"
-          >
-            Issue
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            2
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Pull Request"
-            id="Pull Request"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Pull Request"
-          >
-            Pull Request
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Release"
-            id="Release"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Release"
-          >
-            Release
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Vulnerability Alert"
-            id="Vulnerability Alert"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Vulnerability Alert"
-          >
-            Vulnerability Alert
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Workflow Run"
-            id="Workflow Run"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Workflow Run"
-          >
-            Workflow Run
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
index aa0485c8e..027b9be44 100644
--- a/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
+++ b/src/renderer/components/filters/__snapshots__/UserTypeFilter.test.tsx.snap
@@ -5,50 +5,317 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <fieldset
-        id="filter-user-types"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <legend>
-          <div
-            class="mb-2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <fieldset
+            id="filter-user-types"
           >
+            <legend>
+              <div
+                class="mb-2"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-user-type"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    User Type
+                  </h4>
+                  <button
+                    aria-expanded="false"
+                    aria-haspopup="true"
+                    aria-label="tooltip-user-type"
+                    data-testid="tooltip-tooltip-user-type"
+                    id="tooltip-user-type"
+                    tabindex="0"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-question text-gitify-tooltip-icon"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                      />
+                    </svg>
+                  </button>
+                </div>
+              </div>
+            </legend>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
-              data-gap="condensed"
+              data-gap="normal"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
-              id="title-user-type"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-feed-person"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Bot"
+                  id="Bot"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Bot"
+                >
+                  Bot
+                </label>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-Bot"
+                  data-testid="tooltip-tooltip-Bot"
+                  id="tooltip-Bot"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-Organization"
+                  id="Organization"
+                  type="checkbox"
+                />
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="Organization"
+                >
+                  Organization
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  0
+                </span>
+              </div>
+              <div
+                class="text-sm prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                <input
+                  class="size-4 rounded-sm cursor-pointer"
+                  data-testid="checkbox-User"
+                  id="User"
+                  type="checkbox"
                 />
-              </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
+                <label
+                  class="font-medium text-gitify-font cursor-pointer"
+                  for="User"
+                >
+                  User
+                </label>
+                <span
+                  class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <fieldset
+          id="filter-user-types"
+        >
+          <legend>
+            <div
+              class="mb-2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+                id="title-user-type"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-feed-person"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  />
+                </svg>
+                <h4
+                  class="prc-Heading-Heading-6CmGO"
+                >
+                  User Type
+                </h4>
+                <button
+                  aria-expanded="false"
+                  aria-haspopup="true"
+                  aria-label="tooltip-user-type"
+                  data-testid="tooltip-tooltip-user-type"
+                  id="tooltip-user-type"
+                  tabindex="0"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-question text-gitify-tooltip-icon"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                    />
+                  </svg>
+                </button>
+              </div>
+            </div>
+          </legend>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-gap="normal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Bot"
+                id="Bot"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Bot"
               >
-                User Type
-              </h4>
+                Bot
+              </label>
               <button
                 aria-expanded="false"
                 aria-haspopup="true"
-                aria-label="tooltip-user-type"
-                data-testid="tooltip-tooltip-user-type"
-                id="tooltip-user-type"
+                aria-label="tooltip-Bot"
+                data-testid="tooltip-tooltip-Bot"
+                id="tooltip-Bot"
                 tabindex="0"
                 type="button"
               >
@@ -69,315 +336,70 @@ exports[`renderer/components/filters/UserTypeFilter.tsx should render itself & i
                   />
                 </svg>
               </button>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
             </div>
-          </div>
-        </legend>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="normal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Bot"
-              id="Bot"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Bot"
-            >
-              Bot
-            </label>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-Bot"
-              data-testid="tooltip-tooltip-Bot"
-              id="tooltip-Bot"
-              tabindex="0"
-              type="button"
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-Organization"
+                id="Organization"
+                type="checkbox"
+              />
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="Organization"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-Organization"
-              id="Organization"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="Organization"
-            >
-              Organization
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              0
-            </span>
-          </div>
-          <div
-            class="text-sm prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <input
-              class="size-4 rounded-sm cursor-pointer"
-              data-testid="checkbox-User"
-              id="User"
-              type="checkbox"
-            />
-            <label
-              class="font-medium text-gitify-font cursor-pointer"
-              for="User"
-            >
-              User
-            </label>
-            <span
-              class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-            >
-              1
-            </span>
-          </div>
-        </div>
-      </fieldset>
-    </div>
-  </body>,
-  "container": <div>
-    <fieldset
-      id="filter-user-types"
-    >
-      <legend>
-        <div
-          class="mb-2"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-user-type"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-feed-person"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+                Organization
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                0
+              </span>
+            </div>
+            <div
+              class="text-sm prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+              <input
+                class="size-4 rounded-sm cursor-pointer"
+                data-testid="checkbox-User"
+                id="User"
+                type="checkbox"
               />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
-            >
-              User Type
-            </h4>
-            <button
-              aria-expanded="false"
-              aria-haspopup="true"
-              aria-label="tooltip-user-type"
-              data-testid="tooltip-tooltip-user-type"
-              id="tooltip-user-type"
-              tabindex="0"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-question text-gitify-tooltip-icon"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+              <label
+                class="font-medium text-gitify-font cursor-pointer"
+                for="User"
               >
-                <path
-                  d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-                />
-              </svg>
-            </button>
+                User
+              </label>
+              <span
+                class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </div>
-        </div>
-      </legend>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-gap="normal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Bot"
-            id="Bot"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Bot"
-          >
-            Bot
-          </label>
-          <button
-            aria-expanded="false"
-            aria-haspopup="true"
-            aria-label="tooltip-Bot"
-            data-testid="tooltip-tooltip-Bot"
-            id="tooltip-Bot"
-            tabindex="0"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-question text-gitify-tooltip-icon"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M0 8a8 8 0 1 1 16 0A8 8 0 0 1 0 8Zm8-6.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13ZM6.92 6.085h.001a.749.749 0 1 1-1.342-.67c.169-.339.436-.701.849-.977C6.845 4.16 7.369 4 8 4a2.756 2.756 0 0 1 1.637.525c.503.377.863.965.863 1.725 0 .448-.115.83-.329 1.15-.205.307-.47.513-.692.662-.109.072-.22.138-.313.195l-.006.004a6.24 6.24 0 0 0-.26.16.952.952 0 0 0-.276.245.75.75 0 0 1-1.248-.832c.184-.264.42-.489.692-.661.103-.067.207-.132.313-.195l.007-.004c.1-.061.182-.11.258-.161a.969.969 0 0 0 .277-.245C8.96 6.514 9 6.427 9 6.25a.612.612 0 0 0-.262-.525A1.27 1.27 0 0 0 8 5.5c-.369 0-.595.09-.74.187a1.01 1.01 0 0 0-.34.398ZM9 11a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-Organization"
-            id="Organization"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="Organization"
-          >
-            Organization
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            0
-          </span>
-        </div>
-        <div
-          class="text-sm prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <input
-            class="size-4 rounded-sm cursor-pointer"
-            data-testid="checkbox-User"
-            id="User"
-            type="checkbox"
-          />
-          <label
-            class="font-medium text-gitify-font cursor-pointer"
-            for="User"
-          >
-            User
-          </label>
-          <span
-            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
-          >
-            1
-          </span>
-        </div>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/icons/LogoIcon.test.tsx b/src/renderer/components/icons/LogoIcon.test.tsx
index ccd4f61a3..754ce5fec 100644
--- a/src/renderer/components/icons/LogoIcon.test.tsx
+++ b/src/renderer/components/icons/LogoIcon.test.tsx
@@ -1,25 +1,26 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Size } from '../../types';
 import { LogoIcon } from './LogoIcon';
 
 describe('renderer/components/icons/LogoIcon.tsx', () => {
   it('renders correctly (light)', () => {
-    const tree = render(<LogoIcon size={Size.SMALL} />);
+    const tree = renderWithAppContext(<LogoIcon size={Size.SMALL} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('renders correctly (dark)', () => {
-    const tree = render(<LogoIcon isDark size={Size.SMALL} />);
+    const tree = renderWithAppContext(<LogoIcon isDark size={Size.SMALL} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should click on the logo', async () => {
     const onClick = jest.fn();
-    render(<LogoIcon onClick={onClick} size={Size.SMALL} />);
+    renderWithAppContext(<LogoIcon onClick={onClick} size={Size.SMALL} />);
 
     await userEvent.click(screen.getByLabelText('Gitify Logo'));
 
@@ -27,19 +28,19 @@ describe('renderer/components/icons/LogoIcon.tsx', () => {
   });
 
   it('should render small size', () => {
-    const tree = render(<LogoIcon size={Size.SMALL} />);
+    const tree = renderWithAppContext(<LogoIcon size={Size.SMALL} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render medium size', () => {
-    const tree = render(<LogoIcon size={Size.MEDIUM} />);
+    const tree = renderWithAppContext(<LogoIcon size={Size.MEDIUM} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render large size', () => {
-    const tree = render(<LogoIcon size={Size.LARGE} />);
+    const tree = renderWithAppContext(<LogoIcon size={Size.LARGE} />);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap b/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
index b7226d4e1..12867d6a7 100644
--- a/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
+++ b/src/renderer/components/icons/__snapshots__/LogoIcon.test.tsx.snap
@@ -5,97 +5,119 @@ exports[`renderer/components/icons/LogoIcon.tsx renders correctly (dark) 1`] = `
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-5"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-dark"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#22283B"
-            />
-            <stop
-              offset="100%"
-              stop-color="#555B6E"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <g
-            fill="url(#linearGradient-dark)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
+          <svg
+            aria-hidden="true"
+            aria-label="Gitify Logo"
+            class="size-5"
+            viewBox="0 0 500 500"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
           >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
+            <defs>
+              <lineargradient
+                id="linearGradient-dark"
+                x1="90.8779989%"
+                x2="-1.30249747%"
+                y1="80.0676288%"
+                y2="32.7108237%"
+              >
+                <stop
+                  offset="0%"
+                  stop-color="#22283B"
+                />
+                <stop
+                  offset="100%"
+                  stop-color="#555B6E"
+                />
+              </lineargradient>
+            </defs>
+            <g
+              fill="none"
+              fill-rule="evenodd"
+              stroke="none"
+              stroke-width="1"
+            >
+              <g
+                fill="url(#linearGradient-dark)"
+                fill-rule="nonzero"
+                id="Logo"
+                transform="translate(6.000000, 6.000000)"
+              >
+                <path
+                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                />
+              </g>
+            </g>
+          </svg>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <svg
-      aria-hidden="true"
-      aria-label="Gitify Logo"
-      class="size-5"
-      viewBox="0 0 500 500"
-      xmlns="https://www.w3.org/2000/svg"
-      xmlns:xlink="https://www.w3.org/1999/xlink"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <defs>
-        <lineargradient
-          id="linearGradient-dark"
-          x1="90.8779989%"
-          x2="-1.30249747%"
-          y1="80.0676288%"
-          y2="32.7108237%"
-        >
-          <stop
-            offset="0%"
-            stop-color="#22283B"
-          />
-          <stop
-            offset="100%"
-            stop-color="#555B6E"
-          />
-        </lineargradient>
-      </defs>
-      <g
-        fill="none"
-        fill-rule="evenodd"
-        stroke="none"
-        stroke-width="1"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <g
-          fill="url(#linearGradient-dark)"
-          fill-rule="nonzero"
-          id="Logo"
-          transform="translate(6.000000, 6.000000)"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-5"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <path
-            d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-          />
-        </g>
-      </g>
-    </svg>
+          <defs>
+            <lineargradient
+              id="linearGradient-dark"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#22283B"
+              />
+              <stop
+                offset="100%"
+                stop-color="#555B6E"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
+          >
+            <g
+              fill="url(#linearGradient-dark)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
+            >
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -156,97 +178,119 @@ exports[`renderer/components/icons/LogoIcon.tsx renders correctly (light) 1`] =
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-5"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
+          <svg
+            aria-hidden="true"
+            aria-label="Gitify Logo"
+            class="size-5"
+            viewBox="0 0 500 500"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
           >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
+            <defs>
+              <lineargradient
+                id="linearGradient-light"
+                x1="90.8779989%"
+                x2="-1.30249747%"
+                y1="80.0676288%"
+                y2="32.7108237%"
+              >
+                <stop
+                  offset="0%"
+                  stop-color="#CCCCCC"
+                />
+                <stop
+                  offset="100%"
+                  stop-color="#FFFFFF"
+                />
+              </lineargradient>
+            </defs>
+            <g
+              fill="none"
+              fill-rule="evenodd"
+              stroke="none"
+              stroke-width="1"
+            >
+              <g
+                fill="url(#linearGradient-light)"
+                fill-rule="nonzero"
+                id="Logo"
+                transform="translate(6.000000, 6.000000)"
+              >
+                <path
+                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                />
+              </g>
+            </g>
+          </svg>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <svg
-      aria-hidden="true"
-      aria-label="Gitify Logo"
-      class="size-5"
-      viewBox="0 0 500 500"
-      xmlns="https://www.w3.org/2000/svg"
-      xmlns:xlink="https://www.w3.org/1999/xlink"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <defs>
-        <lineargradient
-          id="linearGradient-light"
-          x1="90.8779989%"
-          x2="-1.30249747%"
-          y1="80.0676288%"
-          y2="32.7108237%"
-        >
-          <stop
-            offset="0%"
-            stop-color="#CCCCCC"
-          />
-          <stop
-            offset="100%"
-            stop-color="#FFFFFF"
-          />
-        </lineargradient>
-      </defs>
-      <g
-        fill="none"
-        fill-rule="evenodd"
-        stroke="none"
-        stroke-width="1"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <g
-          fill="url(#linearGradient-light)"
-          fill-rule="nonzero"
-          id="Logo"
-          transform="translate(6.000000, 6.000000)"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-5"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <path
-            d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-          />
-        </g>
-      </g>
-    </svg>
+          <defs>
+            <lineargradient
+              id="linearGradient-light"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#CCCCCC"
+              />
+              <stop
+                offset="100%"
+                stop-color="#FFFFFF"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
+          >
+            <g
+              fill="url(#linearGradient-light)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
+            >
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -307,97 +351,119 @@ exports[`renderer/components/icons/LogoIcon.tsx should render large size 1`] = `
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-16"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
+          <svg
+            aria-hidden="true"
+            aria-label="Gitify Logo"
+            class="size-16"
+            viewBox="0 0 500 500"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
           >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
+            <defs>
+              <lineargradient
+                id="linearGradient-light"
+                x1="90.8779989%"
+                x2="-1.30249747%"
+                y1="80.0676288%"
+                y2="32.7108237%"
+              >
+                <stop
+                  offset="0%"
+                  stop-color="#CCCCCC"
+                />
+                <stop
+                  offset="100%"
+                  stop-color="#FFFFFF"
+                />
+              </lineargradient>
+            </defs>
+            <g
+              fill="none"
+              fill-rule="evenodd"
+              stroke="none"
+              stroke-width="1"
+            >
+              <g
+                fill="url(#linearGradient-light)"
+                fill-rule="nonzero"
+                id="Logo"
+                transform="translate(6.000000, 6.000000)"
+              >
+                <path
+                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                />
+              </g>
+            </g>
+          </svg>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <svg
-      aria-hidden="true"
-      aria-label="Gitify Logo"
-      class="size-16"
-      viewBox="0 0 500 500"
-      xmlns="https://www.w3.org/2000/svg"
-      xmlns:xlink="https://www.w3.org/1999/xlink"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <defs>
-        <lineargradient
-          id="linearGradient-light"
-          x1="90.8779989%"
-          x2="-1.30249747%"
-          y1="80.0676288%"
-          y2="32.7108237%"
-        >
-          <stop
-            offset="0%"
-            stop-color="#CCCCCC"
-          />
-          <stop
-            offset="100%"
-            stop-color="#FFFFFF"
-          />
-        </lineargradient>
-      </defs>
-      <g
-        fill="none"
-        fill-rule="evenodd"
-        stroke="none"
-        stroke-width="1"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <g
-          fill="url(#linearGradient-light)"
-          fill-rule="nonzero"
-          id="Logo"
-          transform="translate(6.000000, 6.000000)"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-16"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <path
-            d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-          />
-        </g>
-      </g>
-    </svg>
+          <defs>
+            <lineargradient
+              id="linearGradient-light"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#CCCCCC"
+              />
+              <stop
+                offset="100%"
+                stop-color="#FFFFFF"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
+          >
+            <g
+              fill="url(#linearGradient-light)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
+            >
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -458,97 +524,119 @@ exports[`renderer/components/icons/LogoIcon.tsx should render medium size 1`] =
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-10"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
+          <svg
+            aria-hidden="true"
+            aria-label="Gitify Logo"
+            class="size-10"
+            viewBox="0 0 500 500"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
           >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
+            <defs>
+              <lineargradient
+                id="linearGradient-light"
+                x1="90.8779989%"
+                x2="-1.30249747%"
+                y1="80.0676288%"
+                y2="32.7108237%"
+              >
+                <stop
+                  offset="0%"
+                  stop-color="#CCCCCC"
+                />
+                <stop
+                  offset="100%"
+                  stop-color="#FFFFFF"
+                />
+              </lineargradient>
+            </defs>
+            <g
+              fill="none"
+              fill-rule="evenodd"
+              stroke="none"
+              stroke-width="1"
+            >
+              <g
+                fill="url(#linearGradient-light)"
+                fill-rule="nonzero"
+                id="Logo"
+                transform="translate(6.000000, 6.000000)"
+              >
+                <path
+                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                />
+              </g>
+            </g>
+          </svg>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <svg
-      aria-hidden="true"
-      aria-label="Gitify Logo"
-      class="size-10"
-      viewBox="0 0 500 500"
-      xmlns="https://www.w3.org/2000/svg"
-      xmlns:xlink="https://www.w3.org/1999/xlink"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <defs>
-        <lineargradient
-          id="linearGradient-light"
-          x1="90.8779989%"
-          x2="-1.30249747%"
-          y1="80.0676288%"
-          y2="32.7108237%"
-        >
-          <stop
-            offset="0%"
-            stop-color="#CCCCCC"
-          />
-          <stop
-            offset="100%"
-            stop-color="#FFFFFF"
-          />
-        </lineargradient>
-      </defs>
-      <g
-        fill="none"
-        fill-rule="evenodd"
-        stroke="none"
-        stroke-width="1"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <g
-          fill="url(#linearGradient-light)"
-          fill-rule="nonzero"
-          id="Logo"
-          transform="translate(6.000000, 6.000000)"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-10"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <path
-            d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-          />
-        </g>
-      </g>
-    </svg>
+          <defs>
+            <lineargradient
+              id="linearGradient-light"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#CCCCCC"
+              />
+              <stop
+                offset="100%"
+                stop-color="#FFFFFF"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
+          >
+            <g
+              fill="url(#linearGradient-light)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
+            >
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -609,97 +697,119 @@ exports[`renderer/components/icons/LogoIcon.tsx should render small size 1`] = `
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <svg
-        aria-hidden="true"
-        aria-label="Gitify Logo"
-        class="size-5"
-        viewBox="0 0 500 500"
-        xmlns="https://www.w3.org/2000/svg"
-        xmlns:xlink="https://www.w3.org/1999/xlink"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <defs>
-          <lineargradient
-            id="linearGradient-light"
-            x1="90.8779989%"
-            x2="-1.30249747%"
-            y1="80.0676288%"
-            y2="32.7108237%"
-          >
-            <stop
-              offset="0%"
-              stop-color="#CCCCCC"
-            />
-            <stop
-              offset="100%"
-              stop-color="#FFFFFF"
-            />
-          </lineargradient>
-        </defs>
-        <g
-          fill="none"
-          fill-rule="evenodd"
-          stroke="none"
-          stroke-width="1"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <g
-            fill="url(#linearGradient-light)"
-            fill-rule="nonzero"
-            id="Logo"
-            transform="translate(6.000000, 6.000000)"
+          <svg
+            aria-hidden="true"
+            aria-label="Gitify Logo"
+            class="size-5"
+            viewBox="0 0 500 500"
+            xmlns="https://www.w3.org/2000/svg"
+            xmlns:xlink="https://www.w3.org/1999/xlink"
           >
-            <path
-              d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-            />
-          </g>
-        </g>
-      </svg>
+            <defs>
+              <lineargradient
+                id="linearGradient-light"
+                x1="90.8779989%"
+                x2="-1.30249747%"
+                y1="80.0676288%"
+                y2="32.7108237%"
+              >
+                <stop
+                  offset="0%"
+                  stop-color="#CCCCCC"
+                />
+                <stop
+                  offset="100%"
+                  stop-color="#FFFFFF"
+                />
+              </lineargradient>
+            </defs>
+            <g
+              fill="none"
+              fill-rule="evenodd"
+              stroke="none"
+              stroke-width="1"
+            >
+              <g
+                fill="url(#linearGradient-light)"
+                fill-rule="nonzero"
+                id="Logo"
+                transform="translate(6.000000, 6.000000)"
+              >
+                <path
+                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                />
+              </g>
+            </g>
+          </svg>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <svg
-      aria-hidden="true"
-      aria-label="Gitify Logo"
-      class="size-5"
-      viewBox="0 0 500 500"
-      xmlns="https://www.w3.org/2000/svg"
-      xmlns:xlink="https://www.w3.org/1999/xlink"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <defs>
-        <lineargradient
-          id="linearGradient-light"
-          x1="90.8779989%"
-          x2="-1.30249747%"
-          y1="80.0676288%"
-          y2="32.7108237%"
-        >
-          <stop
-            offset="0%"
-            stop-color="#CCCCCC"
-          />
-          <stop
-            offset="100%"
-            stop-color="#FFFFFF"
-          />
-        </lineargradient>
-      </defs>
-      <g
-        fill="none"
-        fill-rule="evenodd"
-        stroke="none"
-        stroke-width="1"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <g
-          fill="url(#linearGradient-light)"
-          fill-rule="nonzero"
-          id="Logo"
-          transform="translate(6.000000, 6.000000)"
+        <svg
+          aria-hidden="true"
+          aria-label="Gitify Logo"
+          class="size-5"
+          viewBox="0 0 500 500"
+          xmlns="https://www.w3.org/2000/svg"
+          xmlns:xlink="https://www.w3.org/1999/xlink"
         >
-          <path
-            d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-          />
-        </g>
-      </g>
-    </svg>
+          <defs>
+            <lineargradient
+              id="linearGradient-light"
+              x1="90.8779989%"
+              x2="-1.30249747%"
+              y1="80.0676288%"
+              y2="32.7108237%"
+            >
+              <stop
+                offset="0%"
+                stop-color="#CCCCCC"
+              />
+              <stop
+                offset="100%"
+                stop-color="#FFFFFF"
+              />
+            </lineargradient>
+          </defs>
+          <g
+            fill="none"
+            fill-rule="evenodd"
+            stroke="none"
+            stroke-width="1"
+          >
+            <g
+              fill="url(#linearGradient-light)"
+              fill-rule="nonzero"
+              id="Logo"
+              transform="translate(6.000000, 6.000000)"
+            >
+              <path
+                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+              />
+            </g>
+          </g>
+        </svg>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/layout/AppLayout.test.tsx b/src/renderer/components/layout/AppLayout.test.tsx
index 2a41945d2..7a74c0d02 100644
--- a/src/renderer/components/layout/AppLayout.test.tsx
+++ b/src/renderer/components/layout/AppLayout.test.tsx
@@ -1,24 +1,14 @@
-import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 
-import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { AppLayout } from './AppLayout';
 
 describe('renderer/components/layout/AppLayout.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          auth: mockAuth,
-          settings: mockSettings,
-          notifications: [],
-        }}
-      >
-        <MemoryRouter>
-          <AppLayout>Test</AppLayout>
-        </MemoryRouter>
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <MemoryRouter>
+        <AppLayout>Test</AppLayout>
+      </MemoryRouter>,
     );
 
     expect(tree).toMatchSnapshot();
diff --git a/src/renderer/components/layout/Centered.test.tsx b/src/renderer/components/layout/Centered.test.tsx
index 9bb464304..f84b5dc33 100644
--- a/src/renderer/components/layout/Centered.test.tsx
+++ b/src/renderer/components/layout/Centered.test.tsx
@@ -1,16 +1,19 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Centered } from './Centered';
 
 describe('renderer/components/layout/Centered.tsx', () => {
   it('should render itself & its children - full height true', () => {
-    const tree = render(<Centered fullHeight={true}>Test</Centered>);
+    const tree = renderWithAppContext(
+      <Centered fullHeight={true}>Test</Centered>,
+    );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - full height false', () => {
-    const tree = render(<Centered fullHeight={false}>Test</Centered>);
+    const tree = renderWithAppContext(
+      <Centered fullHeight={false}>Test</Centered>,
+    );
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/Contents.test.tsx b/src/renderer/components/layout/Contents.test.tsx
index c8d2bce0d..554ad4942 100644
--- a/src/renderer/components/layout/Contents.test.tsx
+++ b/src/renderer/components/layout/Contents.test.tsx
@@ -1,10 +1,9 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Contents } from './Contents';
 
 describe('renderer/components/layout/Contents.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(<Contents>Test</Contents>);
+    const tree = renderWithAppContext(<Contents>Test</Contents>);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/EmojiSplash.test.tsx b/src/renderer/components/layout/EmojiSplash.test.tsx
index a8fb9529e..044a30b54 100644
--- a/src/renderer/components/layout/EmojiSplash.test.tsx
+++ b/src/renderer/components/layout/EmojiSplash.test.tsx
@@ -1,14 +1,17 @@
-import { act, render } from '@testing-library/react';
+import { act } from '@testing-library/react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { EmojiSplash } from './EmojiSplash';
 
 describe('renderer/components/layout/EmojiSplash.tsx', () => {
   it('should render itself & its children - heading only', async () => {
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
       tree = await act(async () => {
-        return render(<EmojiSplash emoji="🍺" heading="Test Heading" />);
+        return renderWithAppContext(
+          <EmojiSplash emoji="🍺" heading="Test Heading" />,
+        );
       });
     });
 
@@ -16,11 +19,11 @@ describe('renderer/components/layout/EmojiSplash.tsx', () => {
   });
 
   it('should render itself & its children - heading and sub-heading', async () => {
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
       tree = await act(async () => {
-        return render(
+        return renderWithAppContext(
           <EmojiSplash
             emoji="🍺"
             heading="Test Heading"
diff --git a/src/renderer/components/layout/Page.test.tsx b/src/renderer/components/layout/Page.test.tsx
index be7289cb8..1b394e724 100644
--- a/src/renderer/components/layout/Page.test.tsx
+++ b/src/renderer/components/layout/Page.test.tsx
@@ -1,10 +1,9 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Page } from './Page';
 
 describe('renderer/components/layout/Page.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(<Page testId="test">Test</Page>);
+    const tree = renderWithAppContext(<Page testId="test">Test</Page>);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
index 4c9132afa..341a2d837 100644
--- a/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/AppLayout.test.tsx.snap
@@ -6,543 +6,565 @@ exports[`renderer/components/layout/AppLayout.tsx should render itself & its chi
   "baseElement": <body>
     <div>
       <div
-        class="flex flex-col min-h-screen bg-gitify-background"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-label="initial focus"
-          class="sr-only focus-visible"
-          data-focus-visible-added=""
-          data-testid="initial-focus-sentinel"
-          type="button"
-        />
         <div
-          class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="normal"
-            data-wrap="nowrap"
+            class="flex flex-col min-h-screen bg-gitify-background"
           >
             <button
-              aria-describedby="_r_1_-loading-announcement _r_0_"
-              aria-label="Gitify"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="sidebar-home"
-              data-variant="invisible"
+              aria-label="initial focus"
+              class="sr-only focus-visible"
+              data-focus-visible-added=""
+              data-testid="initial-focus-sentinel"
               type="button"
+            />
+            <div
+              class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="vertical"
+              data-justify="space-between"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                aria-label="Gitify Logo"
-                class="size-5"
-                viewBox="0 0 500 500"
-                xmlns="https://www.w3.org/2000/svg"
-                xmlns:xlink="https://www.w3.org/1999/xlink"
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="normal"
+                data-wrap="nowrap"
               >
-                <defs>
-                  <lineargradient
-                    id="linearGradient-light"
-                    x1="90.8779989%"
-                    x2="-1.30249747%"
-                    y1="80.0676288%"
-                    y2="32.7108237%"
+                <button
+                  aria-describedby="_r_2_-loading-announcement _r_1_"
+                  aria-label="Gitify"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="small"
+                  data-testid="sidebar-home"
+                  data-variant="invisible"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    aria-label="Gitify Logo"
+                    class="size-5"
+                    viewBox="0 0 500 500"
+                    xmlns="https://www.w3.org/2000/svg"
+                    xmlns:xlink="https://www.w3.org/1999/xlink"
+                  >
+                    <defs>
+                      <lineargradient
+                        id="linearGradient-light"
+                        x1="90.8779989%"
+                        x2="-1.30249747%"
+                        y1="80.0676288%"
+                        y2="32.7108237%"
+                      >
+                        <stop
+                          offset="0%"
+                          stop-color="#CCCCCC"
+                        />
+                        <stop
+                          offset="100%"
+                          stop-color="#FFFFFF"
+                        />
+                      </lineargradient>
+                    </defs>
+                    <g
+                      fill="none"
+                      fill-rule="evenodd"
+                      stroke="none"
+                      stroke-width="1"
+                    >
+                      <g
+                        fill="url(#linearGradient-light)"
+                        fill-rule="nonzero"
+                        id="Logo"
+                        transform="translate(6.000000, 6.000000)"
+                      >
+                        <path
+                          d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                        />
+                      </g>
+                    </g>
+                  </svg>
+                </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-cYMVY"
+                  data-direction="e"
+                  id="_r_1_"
+                  popover="auto"
+                  role="tooltip"
+                >
+                  Home
+                </span>
+                <button
+                  aria-describedby="_r_4_-loading-announcement _r_3_"
+                  aria-label="Notifications"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="small"
+                  data-testid="sidebar-notifications"
+                  data-variant="invisible"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-bell"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
                   >
-                    <stop
-                      offset="0%"
-                      stop-color="#CCCCCC"
+                    <path
+                      d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
                     />
-                    <stop
-                      offset="100%"
-                      stop-color="#FFFFFF"
+                  </svg>
+                </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-cYMVY"
+                  data-direction="e"
+                  id="_r_3_"
+                  popover="auto"
+                  role="tooltip"
+                >
+                  undefined unread notifications ↗
+                </span>
+                <button
+                  aria-describedby="_r_6_-loading-announcement"
+                  aria-labelledby="_r_5_"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="small"
+                  data-testid="sidebar-my-issues"
+                  data-variant="invisible"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-issue-opened"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                    />
+                    <path
+                      d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                     />
-                  </lineargradient>
-                </defs>
-                <g
-                  fill="none"
-                  fill-rule="evenodd"
-                  stroke="none"
-                  stroke-width="1"
+                  </svg>
+                </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-cYMVY"
+                  data-direction="e"
+                  id="_r_5_"
+                  popover="auto"
                 >
-                  <g
-                    fill="url(#linearGradient-light)"
-                    fill-rule="nonzero"
-                    id="Logo"
-                    transform="translate(6.000000, 6.000000)"
+                  My issues ↗
+                </span>
+                <button
+                  aria-describedby="_r_8_-loading-announcement"
+                  aria-labelledby="_r_7_"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="small"
+                  data-testid="sidebar-my-pull-requests"
+                  data-variant="invisible"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-git-pull-request"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
                   >
                     <path
-                      d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                      d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
                     />
-                  </g>
-                </g>
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="e"
-              id="_r_0_"
-              popover="auto"
-              role="tooltip"
-            >
-              Home
-            </span>
-            <button
-              aria-describedby="_r_3_-loading-announcement _r_2_"
-              aria-label="Notifications"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="sidebar-notifications"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-bell"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="e"
-              id="_r_2_"
-              popover="auto"
-              role="tooltip"
-            >
-              undefined unread notifications ↗
-            </span>
-            <button
-              aria-describedby="_r_5_-loading-announcement"
-              aria-labelledby="_r_4_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="sidebar-my-issues"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-issue-opened"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-                />
-                <path
-                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="e"
-              id="_r_4_"
-              popover="auto"
-            >
-              My issues ↗
-            </span>
-            <button
-              aria-describedby="_r_7_-loading-announcement"
-              aria-labelledby="_r_6_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="sidebar-my-pull-requests"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-git-pull-request"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="e"
-              id="_r_6_"
-              popover="auto"
-            >
-              My pull requests ↗
-            </span>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="normal"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_9_-loading-announcement"
-              aria-labelledby="_r_8_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="sidebar-quit"
-              data-variant="invisible"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-x-circle"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
+                  </svg>
+                </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-cYMVY"
+                  data-direction="e"
+                  id="_r_7_"
+                  popover="auto"
+                >
+                  My pull requests ↗
+                </span>
+              </div>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="normal"
+                data-wrap="nowrap"
               >
-                <path
-                  d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="e"
-              id="_r_8_"
-              popover="auto"
+                <button
+                  aria-describedby="_r_a_-loading-announcement"
+                  aria-labelledby="_r_9_"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="small"
+                  data-testid="sidebar-quit"
+                  data-variant="invisible"
+                  type="button"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-x-circle"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
+                    />
+                  </svg>
+                </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-cYMVY"
+                  data-direction="e"
+                  id="_r_9_"
+                  popover="auto"
+                >
+                  Quit Gitify
+                </span>
+              </div>
+            </div>
+            <div
+              class="flex-1 pl-sidebar"
             >
-              Quit Gitify
-            </span>
+              Test
+            </div>
           </div>
         </div>
-        <div
-          class="flex-1 pl-sidebar"
-        >
-          Test
-        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex flex-col min-h-screen bg-gitify-background"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <button
-        aria-label="initial focus"
-        class="sr-only focus-visible"
-        data-focus-visible-added=""
-        data-testid="initial-focus-sentinel"
-        type="button"
-      />
       <div
-        class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="space-between"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
+          class="flex flex-col min-h-screen bg-gitify-background"
         >
           <button
-            aria-describedby="_r_1_-loading-announcement _r_0_"
-            aria-label="Gitify"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-home"
-            data-variant="invisible"
+            aria-label="initial focus"
+            class="sr-only focus-visible"
+            data-focus-visible-added=""
+            data-testid="initial-focus-sentinel"
             type="button"
+          />
+          <div
+            class="fixed w-sidebar h-full bg-gitify-sidebar [&_svg]:text-white prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="vertical"
+            data-justify="space-between"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              aria-label="Gitify Logo"
-              class="size-5"
-              viewBox="0 0 500 500"
-              xmlns="https://www.w3.org/2000/svg"
-              xmlns:xlink="https://www.w3.org/1999/xlink"
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="normal"
+              data-wrap="nowrap"
             >
-              <defs>
-                <lineargradient
-                  id="linearGradient-light"
-                  x1="90.8779989%"
-                  x2="-1.30249747%"
-                  y1="80.0676288%"
-                  y2="32.7108237%"
+              <button
+                aria-describedby="_r_2_-loading-announcement _r_1_"
+                aria-label="Gitify"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-home"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  aria-label="Gitify Logo"
+                  class="size-5"
+                  viewBox="0 0 500 500"
+                  xmlns="https://www.w3.org/2000/svg"
+                  xmlns:xlink="https://www.w3.org/1999/xlink"
+                >
+                  <defs>
+                    <lineargradient
+                      id="linearGradient-light"
+                      x1="90.8779989%"
+                      x2="-1.30249747%"
+                      y1="80.0676288%"
+                      y2="32.7108237%"
+                    >
+                      <stop
+                        offset="0%"
+                        stop-color="#CCCCCC"
+                      />
+                      <stop
+                        offset="100%"
+                        stop-color="#FFFFFF"
+                      />
+                    </lineargradient>
+                  </defs>
+                  <g
+                    fill="none"
+                    fill-rule="evenodd"
+                    stroke="none"
+                    stroke-width="1"
+                  >
+                    <g
+                      fill="url(#linearGradient-light)"
+                      fill-rule="nonzero"
+                      id="Logo"
+                      transform="translate(6.000000, 6.000000)"
+                    >
+                      <path
+                        d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                      />
+                    </g>
+                  </g>
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_1_"
+                popover="auto"
+                role="tooltip"
+              >
+                Home
+              </span>
+              <button
+                aria-describedby="_r_4_-loading-announcement _r_3_"
+                aria-label="Notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-notifications"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_3_"
+                popover="auto"
+                role="tooltip"
+              >
+                undefined unread notifications ↗
+              </span>
+              <button
+                aria-describedby="_r_6_-loading-announcement"
+                aria-labelledby="_r_5_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-my-issues"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <stop
-                    offset="0%"
-                    stop-color="#CCCCCC"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
-                  <stop
-                    offset="100%"
-                    stop-color="#FFFFFF"
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                   />
-                </lineargradient>
-              </defs>
-              <g
-                fill="none"
-                fill-rule="evenodd"
-                stroke="none"
-                stroke-width="1"
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_5_"
+                popover="auto"
               >
-                <g
-                  fill="url(#linearGradient-light)"
-                  fill-rule="nonzero"
-                  id="Logo"
-                  transform="translate(6.000000, 6.000000)"
+                My issues ↗
+              </span>
+              <button
+                aria-describedby="_r_8_-loading-announcement"
+                aria-labelledby="_r_7_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-my-pull-requests"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
                   <path
-                    d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
                   />
-                </g>
-              </g>
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_0_"
-            popover="auto"
-            role="tooltip"
-          >
-            Home
-          </span>
-          <button
-            aria-describedby="_r_3_-loading-announcement _r_2_"
-            aria-label="Notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-notifications"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 16a2 2 0 0 0 1.985-1.75c.017-.137-.097-.25-.235-.25h-3.5c-.138 0-.252.113-.235.25A2 2 0 0 0 8 16ZM3 5a5 5 0 0 1 10 0v2.947c0 .05.015.098.042.139l1.703 2.555A1.519 1.519 0 0 1 13.482 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947Zm5-3.5A3.5 3.5 0 0 0 4.5 5v2.947c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01l.001.006c0 .002.002.004.004.006l.006.004.007.001h10.964l.007-.001.006-.004.004-.006.001-.007a.017.017 0 0 0-.003-.01l-1.703-2.554a1.745 1.745 0 0 1-.294-.97V5A3.5 3.5 0 0 0 8 1.5Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_2_"
-            popover="auto"
-            role="tooltip"
-          >
-            undefined unread notifications ↗
-          </span>
-          <button
-            aria-describedby="_r_5_-loading-announcement"
-            aria-labelledby="_r_4_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-my-issues"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_4_"
-            popover="auto"
-          >
-            My issues ↗
-          </span>
-          <button
-            aria-describedby="_r_7_-loading-announcement"
-            aria-labelledby="_r_6_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-my-pull-requests"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_6_"
-            popover="auto"
-          >
-            My pull requests ↗
-          </span>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="normal"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_9_-loading-announcement"
-            aria-labelledby="_r_8_"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="sidebar-quit"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-x-circle"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_7_"
+                popover="auto"
+              >
+                My pull requests ↗
+              </span>
+            </div>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="normal"
+              data-wrap="nowrap"
             >
-              <path
-                d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_8_"
-            popover="auto"
+              <button
+                aria-describedby="_r_a_-loading-announcement"
+                aria-labelledby="_r_9_"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="sidebar-quit"
+                data-variant="invisible"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-x-circle"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M2.344 2.343h-.001a8 8 0 0 1 11.314 11.314A8.002 8.002 0 0 1 .234 10.089a8 8 0 0 1 2.11-7.746Zm1.06 10.253a6.5 6.5 0 1 0 9.108-9.275 6.5 6.5 0 0 0-9.108 9.275ZM6.03 4.97 8 6.94l1.97-1.97a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734L9.06 8l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L8 9.06l-1.97 1.97a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734L6.94 8 4.97 6.03a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_9_"
+                popover="auto"
+              >
+                Quit Gitify
+              </span>
+            </div>
+          </div>
+          <div
+            class="flex-1 pl-sidebar"
           >
-            Quit Gitify
-          </span>
+            Test
+          </div>
         </div>
       </div>
-      <div
-        class="flex-1 pl-sidebar"
-      >
-        Test
-      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap b/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap
index 1e88c7fb1..e93e2714c 100644
--- a/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/Centered.test.tsx.snap
@@ -6,27 +6,49 @@ exports[`renderer/components/layout/Centered.tsx should render itself & its chil
   "baseElement": <body>
     <div>
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        Test
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-justify="center"
+            data-padding="spacious"
+            data-wrap="nowrap"
+          >
+            Test
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      Test
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="vertical"
+          data-justify="center"
+          data-padding="spacious"
+          data-wrap="nowrap"
+        >
+          Test
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -89,27 +111,49 @@ exports[`renderer/components/layout/Centered.tsx should render itself & its chil
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        Test
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="h-screen prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-justify="center"
+            data-padding="spacious"
+            data-wrap="nowrap"
+          >
+            Test
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      Test
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="h-screen prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="vertical"
+          data-justify="center"
+          data-padding="spacious"
+          data-wrap="nowrap"
+        >
+          Test
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap b/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap
index fd184a9b4..15ccc0ec3 100644
--- a/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/Contents.test.tsx.snap
@@ -6,17 +6,39 @@ exports[`renderer/components/layout/Contents.tsx should render itself & its chil
   "baseElement": <body>
     <div>
       <div
-        class="grow overflow-x-hidden overflow-y-auto px-5"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        Test
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="grow overflow-x-hidden overflow-y-auto px-5"
+          >
+            Test
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="grow overflow-x-hidden overflow-y-auto px-5"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      Test
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="grow overflow-x-hidden overflow-y-auto px-5"
+        >
+          Test
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap b/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
index 5c88794fc..595073fcb 100644
--- a/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/EmojiSplash.test.tsx.snap
@@ -6,51 +6,62 @@ exports[`renderer/components/layout/EmojiSplash.tsx should render itself & its c
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
             <div
-              class="text-7xl"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <img
-                alt="🍺"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f37a.svg"
-              />
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🍺"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f37a.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  Test Heading
+                </div>
+              </div>
+              <div
+                class="text-center"
+              >
+                Test Sub-Heading
+              </div>
             </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Test Heading
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Test Sub-Heading
           </div>
         </div>
       </div>
@@ -58,52 +69,63 @@ exports[`renderer/components/layout/EmojiSplash.tsx should render itself & its c
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🍺"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f37a.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            Test Heading
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🍺"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f37a.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                Test Heading
+              </div>
+            </div>
+            <div
+              class="text-center"
+            >
+              Test Sub-Heading
+            </div>
           </div>
         </div>
-        <div
-          class="text-center"
-        >
-          Test Sub-Heading
-        </div>
       </div>
     </div>
   </div>,
@@ -167,45 +189,56 @@ exports[`renderer/components/layout/EmojiSplash.tsx should render itself & its c
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
             <div
-              class="text-7xl"
-            >
-              <img
-                alt="🍺"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f37a.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              Test Heading
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🍺"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f37a.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  Test Heading
+                </div>
+              </div>
             </div>
           </div>
         </div>
@@ -214,45 +247,56 @@ exports[`renderer/components/layout/EmojiSplash.tsx should render itself & its c
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🍺"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f37a.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            Test Heading
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🍺"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f37a.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                Test Heading
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap b/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap
index 4c981c9d6..9c849210b 100644
--- a/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap
+++ b/src/renderer/components/layout/__snapshots__/Page.test.tsx.snap
@@ -6,19 +6,41 @@ exports[`renderer/components/layout/Page.tsx should render itself & its children
   "baseElement": <body>
     <div>
       <div
-        class="flex flex-col h-screen"
-        data-testid="test"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        Test
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="flex flex-col h-screen"
+            data-testid="test"
+          >
+            Test
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex flex-col h-screen"
-      data-testid="test"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      Test
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="flex flex-col h-screen"
+          data-testid="test"
+        >
+          Test
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/metrics/MetricGroup.test.tsx b/src/renderer/components/metrics/MetricGroup.test.tsx
index c74849a39..030c171c4 100644
--- a/src/renderer/components/metrics/MetricGroup.test.tsx
+++ b/src/renderer/components/metrics/MetricGroup.test.tsx
@@ -1,7 +1,5 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
 import type { Milestone } from '../../typesGitHub';
 import { mockSingleNotification } from '../../utils/api/__mocks__/response-mocks';
 import { MetricGroup } from './MetricGroup';
@@ -15,15 +13,9 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: { ...mockSettings, showPills: false },
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />, {
+        settings: { ...mockSettings, showPills: false },
+      });
       expect(tree).toMatchSnapshot();
     });
   });
@@ -37,15 +29,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
 
@@ -57,15 +41,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
   });
@@ -79,15 +55,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
 
@@ -99,15 +67,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
 
@@ -119,15 +79,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
   });
@@ -141,15 +93,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
   });
@@ -166,15 +110,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
 
@@ -189,15 +125,7 @@ describe('renderer/components/metrics/MetricGroup.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: mockSettings,
-          }}
-        >
-          <MetricGroup {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<MetricGroup {...props} />);
       expect(tree).toMatchSnapshot();
     });
   });
diff --git a/src/renderer/components/metrics/MetricPill.test.tsx b/src/renderer/components/metrics/MetricPill.test.tsx
index f6e37ff1d..9f619f6c9 100644
--- a/src/renderer/components/metrics/MetricPill.test.tsx
+++ b/src/renderer/components/metrics/MetricPill.test.tsx
@@ -1,7 +1,6 @@
-import { render } from '@testing-library/react';
-
 import { MarkGithubIcon } from '@primer/octicons-react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { IconColor } from '../../types';
 import { MetricPill, type MetricPillProps } from './MetricPill';
 
@@ -13,7 +12,7 @@ describe('renderer/components/metrics/MetricPill.tsx', () => {
       icon: MarkGithubIcon,
       color: IconColor.GREEN,
     };
-    const tree = render(<MetricPill {...props} />);
+    const tree = renderWithAppContext(<MetricPill {...props} />);
     expect(tree).toMatchSnapshot();
   });
 
@@ -23,7 +22,7 @@ describe('renderer/components/metrics/MetricPill.tsx', () => {
       icon: MarkGithubIcon,
       color: IconColor.GREEN,
     };
-    const tree = render(<MetricPill {...props} />);
+    const tree = renderWithAppContext(<MetricPill {...props} />);
     expect(tree).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
index be088f070..a4ea8ade5 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricGroup.test.tsx.snap
@@ -6,325 +6,347 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="1 comment"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="1 comment"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-comment text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="1 comment"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-comment text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="1 comment"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-comment text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -387,325 +409,347 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="2 comments"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="2 comments"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-comment text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="2 comments"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-comment text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="2 comments"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-comment text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -768,249 +812,271 @@ exports[`renderer/components/metrics/MetricGroup.tsx comment pills should render
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -1073,403 +1139,425 @@ exports[`renderer/components/metrics/MetricGroup.tsx label pills should render l
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="2 comments"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="2 comments"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-comment text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="🏷️ enhancement
-🏷️ good-first-issue"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-tag text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="🏷️ enhancement
+🏷️ good-first-issue"
             >
-              2
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-tag text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="2 comments"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-comment text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="2 comments"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-comment text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="🏷️ enhancement
-🏷️ good-first-issue"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-tag text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="🏷️ enhancement
+🏷️ good-first-issue"
           >
-            2
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-tag text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -1532,249 +1620,271 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -1837,249 +1947,271 @@ exports[`renderer/components/metrics/MetricGroup.tsx linked issue pills should r
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issue #1"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issue #1"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issue #1"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issue #1"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -2142,469 +2274,491 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="2 comments"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="2 comments"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-comment text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="🏷️ enhancement
-🏷️ good-first-issue"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-tag text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="🏷️ enhancement
+🏷️ good-first-issue"
             >
-              2
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-tag text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
+            </span>
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Milestone 1"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-milestone text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+                  />
+                </svg>
+              </div>
             </span>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Milestone 1"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-milestone text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-              />
-            </svg>
-          </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="2 comments"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-comment text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="2 comments"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-comment text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="🏷️ enhancement
+          <span
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="🏷️ enhancement
 🏷️ good-first-issue"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-tag text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
           >
-            <path
-              d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-            />
-          </svg>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-tag text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
+          </span>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Milestone 1"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-milestone text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+                />
+              </svg>
+            </div>
           </span>
         </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Milestone 1"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-milestone text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-            />
-          </svg>
-        </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -2667,469 +2821,491 @@ exports[`renderer/components/metrics/MetricGroup.tsx milestone pills should rend
   "baseElement": <body>
     <div>
       <div
-        class="flex gap-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Linked to issues #1, #2"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Linked to issues #1, #2"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="2 comments"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-comment text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              2
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="2 comments"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-comment text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
             </span>
-          </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="🏷️ enhancement
-🏷️ good-first-issue"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-tag text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="🏷️ enhancement
+🏷️ good-first-issue"
             >
-              2
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-tag text-gitify-icon-muted"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  2
+                </span>
+              </div>
+            </span>
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="Milestone 1"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-milestone text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+                  />
+                </svg>
+              </div>
             </span>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="Milestone 1"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-milestone text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-              />
-            </svg>
-          </div>
-        </span>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="flex gap-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Linked to issues #1, #2"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="flex gap-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Linked to issues #1, #2"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="octocat approved these changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="octocat approved these changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="gitify-app requested changes"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-file-diff text-gitify-icon-closed"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            1
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="gitify-app requested changes"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-file-diff text-gitify-icon-closed"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="2 comments"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-comment text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="2 comments"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-comment text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 2.75C1 1.784 1.784 1 2.75 1h10.5c.966 0 1.75.784 1.75 1.75v7.5A1.75 1.75 0 0 1 13.25 12H9.06l-2.573 2.573A1.458 1.458 0 0 1 4 13.543V12H2.75A1.75 1.75 0 0 1 1 10.25Zm1.75-.25a.25.25 0 0 0-.25.25v7.5c0 .138.112.25.25.25h2a.75.75 0 0 1 .75.75v2.19l2.72-2.72a.749.749 0 0 1 .53-.22h4.5a.25.25 0 0 0 .25-.25v-7.5a.25.25 0 0 0-.25-.25Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
           </span>
-        </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="🏷️ enhancement
+          <span
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="🏷️ enhancement
 🏷️ good-first-issue"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-tag text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
           >
-            <path
-              d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
-            />
-          </svg>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-tag text-gitify-icon-muted"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M1 7.775V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 0 1 0 2.474l-5.026 5.026a1.75 1.75 0 0 1-2.474 0l-6.25-6.25A1.752 1.752 0 0 1 1 7.775Zm1.5 0c0 .066.026.13.073.177l6.25 6.25a.25.25 0 0 0 .354 0l5.025-5.025a.25.25 0 0 0 0-.354l-6.25-6.25a.25.25 0 0 0-.177-.073H2.75a.25.25 0 0 0-.25.25ZM6 5a1 1 0 1 1 0 2 1 1 0 0 1 0-2Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                2
+              </span>
+            </div>
+          </span>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
-          >
-            2
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Milestone 1"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-milestone text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
+                />
+              </svg>
+            </div>
           </span>
         </div>
-      </span>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Milestone 1"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-milestone text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M7.75 0a.75.75 0 0 1 .75.75V3h3.634c.414 0 .814.147 1.13.414l2.07 1.75a1.75 1.75 0 0 1 0 2.672l-2.07 1.75a1.75 1.75 0 0 1-1.13.414H8.5v5.25a.75.75 0 0 1-1.5 0V10H2.75A1.75 1.75 0 0 1 1 8.25v-3.5C1 3.784 1.784 3 2.75 3H7V.75A.75.75 0 0 1 7.75 0Zm4.384 8.5a.25.25 0 0 0 .161-.06l2.07-1.75a.248.248 0 0 0 0-.38l-2.07-1.75a.25.25 0 0 0-.161-.06H2.75a.25.25 0 0 0-.25.25v3.5c0 .138.112.25.25.25h9.384Z"
-            />
-          </svg>
-        </div>
-      </span>
+      </div>
     </div>
   </div>,
   "debug": [Function],
@@ -3190,9 +3366,31 @@ exports[`renderer/components/metrics/MetricGroup.tsx showPills disabled should n
 {
   "asFragment": [Function],
   "baseElement": <body>
-    <div />
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        />
+      </div>
+    </div>
   </body>,
-  "container": <div />,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      />
+    </div>
+  </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
   "findAllByDisplayValue": [Function],
diff --git a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
index 6e4b0941a..8e4cd72c1 100644
--- a/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
+++ b/src/renderer/components/metrics/__snapshots__/MetricPill.test.tsx.snap
@@ -5,85 +5,107 @@ exports[`renderer/components/metrics/MetricPill.tsx should render with metric 1`
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Mock Pill"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-mark-github text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
-          >
-            <path
-              d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-            />
-          </svg>
           <span
-            class="text-xxs px-1 prc-Text-Text-0ima0"
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Mock Pill"
           >
-            1
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                />
+              </svg>
+              <span
+                class="text-xxs px-1 prc-Text-Text-0ima0"
+              >
+                1
+              </span>
+            </div>
           </span>
         </div>
-      </span>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <span
-      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-      data-size="small"
-      data-variant="secondary"
-      title="Mock Pill"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github text-gitify-icon-open"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="12"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="12"
-        >
-          <path
-            d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-          />
-        </svg>
         <span
-          class="text-xxs px-1 prc-Text-Text-0ima0"
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+          data-size="small"
+          data-variant="secondary"
+          title="Mock Pill"
         >
-          1
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github text-gitify-icon-open"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+            <span
+              class="text-xxs px-1 prc-Text-Text-0ima0"
+            >
+              1
+            </span>
+          </div>
         </span>
       </div>
-    </span>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -144,75 +166,97 @@ exports[`renderer/components/metrics/MetricPill.tsx should render without metric
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <span
-        class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-        data-size="small"
-        data-variant="secondary"
-        title="Mock Pill"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-mark-github text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="12"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="12"
+          <span
+            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+            data-size="small"
+            data-variant="secondary"
+            title="Mock Pill"
           >
-            <path
-              d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-            />
-          </svg>
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-mark-github text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="12"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="12"
+              >
+                <path
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                />
+              </svg>
+            </div>
+          </span>
         </div>
-      </span>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <span
-      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-      data-size="small"
-      data-variant="secondary"
-      title="Mock Pill"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github text-gitify-icon-open"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="12"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="12"
+        <span
+          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+          data-size="small"
+          data-variant="secondary"
+          title="Mock Pill"
         >
-          <path
-            d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-          />
-        </svg>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github text-gitify-icon-open"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="12"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="12"
+            >
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+          </div>
+        </span>
       </div>
-    </span>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/notifications/AccountNotifications.test.tsx b/src/renderer/components/notifications/AccountNotifications.test.tsx
index 0c848f588..5c023bbaf 100644
--- a/src/renderer/components/notifications/AccountNotifications.test.tsx
+++ b/src/renderer/components/notifications/AccountNotifications.test.tsx
@@ -1,13 +1,12 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import {
-  mockAuth,
-  mockGitHubCloudAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
-import { ensureStableEmojis } from '../../__mocks__/utils';
-import { AppContext } from '../../context/App';
+  ensureStableEmojis,
+  renderWithAppContext,
+} from '../../__helpers__/test-utils';
+import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import { GroupBy } from '../../types';
 import { mockGitHubNotifications } from '../../utils/api/__mocks__/response-mocks';
 import * as links from '../../utils/links';
@@ -30,13 +29,9 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY } }}
-      >
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<AccountNotifications {...props} />, {
+      settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY },
+    });
 
     expect(tree).toMatchSnapshot();
   });
@@ -49,13 +44,9 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.DATE } }}
-      >
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<AccountNotifications {...props} />, {
+      settings: { ...mockSettings, groupBy: GroupBy.DATE },
+    });
 
     expect(tree).toMatchSnapshot();
   });
@@ -68,14 +59,10 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(
-        <AppContext.Provider value={{ settings: mockSettings }}>
-          <AccountNotifications {...props} />
-        </AppContext.Provider>,
-      );
+      tree = renderWithAppContext(<AccountNotifications {...props} />);
     });
 
     expect(tree).toMatchSnapshot();
@@ -93,19 +80,12 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       showAccountHeader: true,
     };
 
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(
-        <AppContext.Provider
-          value={{
-            auth: { accounts: [mockGitHubCloudAccount] },
-            settings: mockSettings,
-          }}
-        >
-          <AccountNotifications {...props} />
-        </AppContext.Provider>,
-      );
+      tree = renderWithAppContext(<AccountNotifications {...props} />, {
+        auth: { accounts: [mockGitHubCloudAccount] },
+      });
     });
 
     expect(tree).toMatchSnapshot();
@@ -123,21 +103,17 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       showAccountHeader: true,
     };
 
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(
-        <AppContext.Provider value={{ auth: mockAuth, settings: mockSettings }}>
-          <AccountNotifications {...props} />
-        </AppContext.Provider>,
-      );
+      tree = renderWithAppContext(<AccountNotifications {...props} />);
     });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should open profile when clicked', async () => {
-    const openAccountProfileMock = jest
+    const mockOpenAccountProfile = jest
       .spyOn(links, 'openAccountProfile')
       .mockImplementation();
 
@@ -148,20 +124,16 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-profile'));
 
-    expect(openAccountProfileMock).toHaveBeenCalledTimes(1);
-    expect(openAccountProfileMock).toHaveBeenCalledWith(mockGitHubCloudAccount);
+    expect(mockOpenAccountProfile).toHaveBeenCalledTimes(1);
+    expect(mockOpenAccountProfile).toHaveBeenCalledWith(mockGitHubCloudAccount);
   });
 
   it('should open my issues when clicked', async () => {
-    const openMyIssuesMock = jest
+    const mockOpenGitHubIssues = jest
       .spyOn(links, 'openGitHubIssues')
       .mockImplementation();
 
@@ -172,22 +144,18 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-issues'));
 
-    expect(openMyIssuesMock).toHaveBeenCalledTimes(1);
-    expect(openMyIssuesMock).toHaveBeenCalledWith(
+    expect(mockOpenGitHubIssues).toHaveBeenCalledTimes(1);
+    expect(mockOpenGitHubIssues).toHaveBeenCalledWith(
       mockGitHubCloudAccount.hostname,
     );
   });
 
   it('should open my pull requests when clicked', async () => {
-    const openPullRequestsMock = jest
+    const mockOpenGitHubPulls = jest
       .spyOn(links, 'openGitHubPulls')
       .mockImplementation();
 
@@ -198,16 +166,12 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-pull-requests'));
 
-    expect(openPullRequestsMock).toHaveBeenCalledTimes(1);
-    expect(openPullRequestsMock).toHaveBeenCalledWith(
+    expect(mockOpenGitHubPulls).toHaveBeenCalledTimes(1);
+    expect(mockOpenGitHubPulls).toHaveBeenCalledWith(
       mockGitHubCloudAccount.hostname,
     );
   });
@@ -220,19 +184,12 @@ describe('renderer/components/notifications/AccountNotifications.tsx', () => {
       error: null,
     };
 
-    render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<AccountNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('account-toggle'));
 
-    const tree = render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <AccountNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<AccountNotifications {...props} />);
+
     expect(tree).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/notifications/NotificationFooter.test.tsx b/src/renderer/components/notifications/NotificationFooter.test.tsx
index f7ee60fa8..465612ddb 100644
--- a/src/renderer/components/notifications/NotificationFooter.test.tsx
+++ b/src/renderer/components/notifications/NotificationFooter.test.tsx
@@ -1,12 +1,9 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import {
-  mockGitHubCloudAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
-import { GroupBy, type Link } from '../../types';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
+import type { Link } from '../../types';
 import type { UserType } from '../../typesGitHub';
 import { mockSingleNotification } from '../../utils/api/__mocks__/response-mocks';
 import * as comms from '../../utils/comms';
@@ -19,27 +16,21 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
 
   it('should render itself & its children', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const props = {
       notification: mockSingleNotification,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.DATE } }}
-      >
-        <NotificationFooter {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationFooter {...props} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children when last_read_at is null', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const mockNotification = mockSingleNotification;
@@ -49,11 +40,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
       notification: mockNotification,
     };
 
-    const tree = render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <NotificationFooter {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationFooter {...props} />);
 
     expect(tree).toMatchSnapshot();
   });
@@ -61,7 +48,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
   describe('security alerts should use github icon for avatar', () => {
     it('Repository Dependabot Alerts Thread', async () => {
       jest
-        .spyOn(global.Date, 'now')
+        .spyOn(globalThis.Date, 'now')
         .mockImplementation(() => new Date('2024').valueOf());
 
       const mockNotification = mockSingleNotification;
@@ -71,18 +58,14 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider value={{ settings: mockSettings }}>
-          <NotificationFooter {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationFooter {...props} />);
 
       expect(tree).toMatchSnapshot();
     });
 
     it('Repository Vulnerability Alert', async () => {
       jest
-        .spyOn(global.Date, 'now')
+        .spyOn(globalThis.Date, 'now')
         .mockImplementation(() => new Date('2024').valueOf());
 
       const mockNotification = mockSingleNotification;
@@ -92,11 +75,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
         notification: mockNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider value={{ settings: mockSettings }}>
-          <NotificationFooter {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationFooter {...props} />);
 
       expect(tree).toMatchSnapshot();
     });
@@ -104,7 +83,7 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
 
   it('should default to known avatar if no user found', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const mockNotification = mockSingleNotification;
@@ -114,17 +93,13 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
       notification: mockNotification,
     };
 
-    const tree = render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <NotificationFooter {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationFooter {...props} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should open notification user profile', async () => {
-    const openExternalLinkMock = jest
+    const mockOpenExternalLink = jest
       .spyOn(comms, 'openExternalLink')
       .mockImplementation();
 
@@ -146,20 +121,12 @@ describe('renderer/components/notifications/NotificationFooter.tsx', () => {
       account: mockGitHubCloudAccount,
     };
 
-    render(
-      <AppContext.Provider
-        value={{
-          settings: { ...mockSettings },
-        }}
-      >
-        <NotificationFooter {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<NotificationFooter {...props} />);
 
     await userEvent.click(screen.getByTestId('view-profile'));
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       props.notification.subject.user.html_url,
     );
   });
diff --git a/src/renderer/components/notifications/NotificationHeader.test.tsx b/src/renderer/components/notifications/NotificationHeader.test.tsx
index 712977216..b54e7e8d4 100644
--- a/src/renderer/components/notifications/NotificationHeader.test.tsx
+++ b/src/renderer/components/notifications/NotificationHeader.test.tsx
@@ -1,8 +1,8 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
 import { GroupBy } from '../../types';
 import { mockSingleNotification } from '../../utils/api/__mocks__/response-mocks';
 import * as comms from '../../utils/comms';
@@ -18,13 +18,9 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
       notification: mockSingleNotification,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY } }}
-      >
-        <NotificationHeader {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+      settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY },
+    });
 
     expect(tree).toMatchSnapshot();
   });
@@ -35,13 +31,9 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
         notification: mockSingleNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{ settings: { ...mockSettings, groupBy: GroupBy.DATE } }}
-        >
-          <NotificationHeader {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+        settings: { ...mockSettings, groupBy: GroupBy.DATE },
+      });
 
       expect(tree).toMatchSnapshot();
     });
@@ -51,19 +43,13 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
         notification: mockSingleNotification,
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              showNumber: false,
-              groupBy: GroupBy.DATE,
-            },
-          }}
-        >
-          <NotificationHeader {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+        settings: {
+          ...mockSettings,
+          showNumber: false,
+          groupBy: GroupBy.DATE,
+        },
+      });
 
       expect(tree).toMatchSnapshot();
     });
@@ -76,20 +62,16 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
         },
       };
 
-      const tree = render(
-        <AppContext.Provider
-          value={{ settings: { ...mockSettings, groupBy: GroupBy.DATE } }}
-        >
-          <NotificationHeader {...props} />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationHeader {...props} />, {
+        settings: { ...mockSettings, groupBy: GroupBy.DATE },
+      });
 
       expect(tree).toMatchSnapshot();
     });
   });
 
   it('should open notification user profile - group by date', async () => {
-    const openExternalLinkMock = jest
+    const mockOpenExternalLink = jest
       .spyOn(comms, 'openExternalLink')
       .mockImplementation();
 
@@ -97,18 +79,14 @@ describe('renderer/components/notifications/NotificationHeader.tsx', () => {
       notification: mockSingleNotification,
     };
 
-    render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.DATE } }}
-      >
-        <NotificationHeader {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<NotificationHeader {...props} />, {
+      settings: { ...mockSettings, groupBy: GroupBy.DATE },
+    });
 
     await userEvent.click(screen.getByTestId('view-repository'));
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       props.notification.repository.html_url,
     );
   });
diff --git a/src/renderer/components/notifications/NotificationRow.test.tsx b/src/renderer/components/notifications/NotificationRow.test.tsx
index 2feb18a85..29c7ee9d3 100644
--- a/src/renderer/components/notifications/NotificationRow.test.tsx
+++ b/src/renderer/components/notifications/NotificationRow.test.tsx
@@ -1,12 +1,9 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import {
-  mockAuth,
-  mockGitHubCloudAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import { GroupBy } from '../../types';
 import { mockSingleNotification } from '../../utils/api/__mocks__/response-mocks';
 import * as comms from '../../utils/comms';
@@ -23,7 +20,7 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
 
   it('should render itself & its children - group by date', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const props = {
@@ -31,20 +28,16 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       account: mockGitHubCloudAccount,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.DATE } }}
-      >
-        <NotificationRow {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationRow {...props} />, {
+      settings: { ...mockSettings, groupBy: GroupBy.DATE },
+    });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - group by repositories', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const props = {
@@ -52,20 +45,16 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       account: mockGitHubCloudAccount,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY } }}
-      >
-        <NotificationRow {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationRow {...props} />, {
+      settings: { ...mockSettings, groupBy: GroupBy.REPOSITORY },
+    });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - hide numbers', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const props = {
@@ -73,20 +62,16 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       account: mockGitHubCloudAccount,
     };
 
-    const tree = render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings, showNumber: false } }}
-      >
-        <NotificationRow {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationRow {...props} />, {
+      settings: { ...mockSettings, showNumber: false },
+    });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - notification is read', async () => {
     jest
-      .spyOn(global.Date, 'now')
+      .spyOn(globalThis.Date, 'now')
       .mockImplementation(() => new Date('2024').valueOf());
 
     const props = {
@@ -97,40 +82,29 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
       account: mockGitHubCloudAccount,
     };
 
-    const tree = render(
-      <AppContext.Provider value={{ settings: mockSettings }}>
-        <NotificationRow {...props} />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationRow {...props} />);
 
     expect(tree).toMatchSnapshot();
   });
 
   describe('notification interactions', () => {
     it('should open a notification in the browser - click', async () => {
-      const markNotificationsAsRead = jest.fn();
+      const mockMarkNotificationsAsRead = jest.fn();
 
       const props = {
         notification: mockSingleNotification,
         account: mockGitHubCloudAccount,
       };
 
-      render(
-        <AppContext.Provider
-          value={{
-            settings: { ...mockSettings, markAsDoneOnOpen: false },
-            markNotificationsAsRead,
-            auth: mockAuth,
-          }}
-        >
-          <NotificationRow {...props} />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: { ...mockSettings, markAsDoneOnOpen: false },
+        markNotificationsAsRead: mockMarkNotificationsAsRead,
+      });
 
       await userEvent.click(screen.getByTestId('notification-row'));
 
       expect(links.openNotification).toHaveBeenCalledTimes(1);
-      expect(markNotificationsAsRead).toHaveBeenCalledTimes(1);
+      expect(mockMarkNotificationsAsRead).toHaveBeenCalledTimes(1);
     });
 
     it('should open a notification in the browser - delay notification setting enabled', async () => {
@@ -141,21 +115,14 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
         account: mockGitHubCloudAccount,
       };
 
-      render(
-        <AppContext.Provider
-          value={{
-            settings: {
-              ...mockSettings,
-              markAsDoneOnOpen: false,
-              delayNotificationState: true,
-            },
-            markNotificationsAsRead,
-            auth: mockAuth,
-          }}
-        >
-          <NotificationRow {...props} />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: {
+          ...mockSettings,
+          markAsDoneOnOpen: false,
+          delayNotificationState: true,
+        },
+        markNotificationsAsRead,
+      });
 
       await userEvent.click(screen.getByTestId('notification-row'));
 
@@ -164,99 +131,77 @@ describe('renderer/components/notifications/NotificationRow.tsx', () => {
     });
 
     it('should open a notification in browser & mark it as done', async () => {
-      const markNotificationsAsDone = jest.fn();
+      const mockMarkNotificationsAsDone = jest.fn();
 
       const props = {
         notification: mockSingleNotification,
         account: mockGitHubCloudAccount,
       };
 
-      render(
-        <AppContext.Provider
-          value={{
-            settings: { ...mockSettings, markAsDoneOnOpen: true },
-            markNotificationsAsDone,
-            auth: mockAuth,
-          }}
-        >
-          <NotificationRow {...props} />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: { ...mockSettings, markAsDoneOnOpen: true },
+        markNotificationsAsDone: mockMarkNotificationsAsDone,
+      });
 
       await userEvent.click(screen.getByTestId('notification-row'));
 
       expect(links.openNotification).toHaveBeenCalledTimes(1);
-      expect(markNotificationsAsDone).toHaveBeenCalledTimes(1);
+      expect(mockMarkNotificationsAsDone).toHaveBeenCalledTimes(1);
     });
 
     it('should mark notifications as read', async () => {
-      const markNotificationsAsRead = jest.fn();
+      const mockMarkNotificationsAsRead = jest.fn();
 
       const props = {
         notification: mockSingleNotification,
         account: mockGitHubCloudAccount,
       };
 
-      render(
-        <AppContext.Provider
-          value={{
-            settings: { ...mockSettings, markAsDoneOnOpen: false },
-            markNotificationsAsRead,
-          }}
-        >
-          <NotificationRow {...props} />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: { ...mockSettings, markAsDoneOnOpen: false },
+        markNotificationsAsRead: mockMarkNotificationsAsRead,
+      });
 
       await userEvent.click(screen.getByTestId('notification-mark-as-read'));
 
-      expect(markNotificationsAsRead).toHaveBeenCalledTimes(1);
+      expect(mockMarkNotificationsAsRead).toHaveBeenCalledTimes(1);
     });
 
     it('should mark notifications as done', async () => {
-      const markNotificationsAsDone = jest.fn();
+      const mockMarkNotificationsAsDone = jest.fn();
 
       const props = {
         notification: mockSingleNotification,
         account: mockGitHubCloudAccount,
       };
 
-      render(
-        <AppContext.Provider
-          value={{ settings: mockSettings, markNotificationsAsDone }}
-        >
-          <NotificationRow {...props} />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationRow {...props} />, {
+        settings: mockSettings,
+        markNotificationsAsDone: mockMarkNotificationsAsDone,
+      });
 
       await userEvent.click(screen.getByTestId('notification-mark-as-done'));
 
-      expect(markNotificationsAsDone).toHaveBeenCalledTimes(1);
+      expect(mockMarkNotificationsAsDone).toHaveBeenCalledTimes(1);
     });
 
     it('should unsubscribe from a notification thread', async () => {
-      const unsubscribeNotification = jest.fn();
+      const mockUnsubscribeNotification = jest.fn();
 
       const props = {
         notification: mockSingleNotification,
         account: mockGitHubCloudAccount,
       };
 
-      render(
-        <AppContext.Provider value={{}}>
-          <AppContext.Provider
-            value={{ settings: mockSettings, unsubscribeNotification }}
-          >
-            <NotificationRow {...props} />
-          </AppContext.Provider>
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationRow {...props} />, {
+        unsubscribeNotification: mockUnsubscribeNotification,
+      });
 
       await userEvent.click(
         screen.getByTestId('notification-unsubscribe-from-thread'),
       );
 
-      expect(unsubscribeNotification).toHaveBeenCalledTimes(1);
+      expect(mockUnsubscribeNotification).toHaveBeenCalledTimes(1);
     });
   });
 });
diff --git a/src/renderer/components/notifications/RepositoryNotifications.test.tsx b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
index bd352b37e..ddcb5f6fa 100644
--- a/src/renderer/components/notifications/RepositoryNotifications.test.tsx
+++ b/src/renderer/components/notifications/RepositoryNotifications.test.tsx
@@ -1,11 +1,9 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import {
-  mockGitHubCloudAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import type { Link } from '../../types';
 import { mockGitHubNotifications } from '../../utils/api/__mocks__/response-mocks';
 import * as comms from '../../utils/comms';
@@ -30,10 +28,9 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
   });
 
   it('should render itself & its children', () => {
-    const tree = render(
-      <AppContext.Provider value={{}}>
-        <RepositoryNotifications {...props} />
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <RepositoryNotifications {...props} />,
+      {},
     );
 
     expect(tree).toMatchSnapshot();
@@ -44,42 +41,34 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
       n.unread = false;
     }
 
-    const tree = render(
-      <AppContext.Provider value={{}}>
-        <RepositoryNotifications {...props} />
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <RepositoryNotifications {...props} />,
+      {},
     );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should open the browser when clicking on the repo name', async () => {
-    const openExternalLinkMock = jest
+    const mockOpenExternalLink = jest
       .spyOn(comms, 'openExternalLink')
       .mockImplementation();
 
-    render(
-      <AppContext.Provider value={{}}>
-        <RepositoryNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<RepositoryNotifications {...props} />);
 
     await userEvent.click(screen.getByTestId('open-repository'));
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/gitify-app/notifications-test',
     );
   });
 
   it('should mark a repo as read', async () => {
-    render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings }, markNotificationsAsRead }}
-      >
-        <RepositoryNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<RepositoryNotifications {...props} />, {
+      settings: { ...mockSettings },
+      markNotificationsAsRead,
+    });
 
     await userEvent.click(screen.getByTestId('repository-mark-as-read'));
 
@@ -89,13 +78,10 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
   });
 
   it('should mark a repo as done', async () => {
-    render(
-      <AppContext.Provider
-        value={{ settings: { ...mockSettings }, markNotificationsAsDone }}
-      >
-        <RepositoryNotifications {...props} />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<RepositoryNotifications {...props} />, {
+      settings: { ...mockSettings },
+      markNotificationsAsDone,
+    });
 
     await userEvent.click(screen.getByTestId('repository-mark-as-done'));
 
@@ -107,10 +93,9 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
   it('should use default repository icon when avatar is not available', () => {
     props.repoNotifications[0].repository.owner.avatar_url = '' as Link;
 
-    const tree = render(
-      <AppContext.Provider value={{}}>
-        <RepositoryNotifications {...props} />
-      </AppContext.Provider>,
+    const tree = renderWithAppContext(
+      <RepositoryNotifications {...props} />,
+      {},
     );
 
     expect(tree).toMatchSnapshot();
@@ -118,12 +103,12 @@ describe('renderer/components/notifications/RepositoryNotifications.tsx', () =>
 
   it('should toggle repository notifications visibility', async () => {
     await act(async () => {
-      render(<RepositoryNotifications {...props} />);
+      renderWithAppContext(<RepositoryNotifications {...props} />);
     });
 
     await userEvent.click(screen.getByTestId('repository-toggle'));
 
-    const tree = render(<RepositoryNotifications {...props} />);
+    const tree = renderWithAppContext(<RepositoryNotifications {...props} />);
     expect(tree).toMatchSnapshot();
   });
 });
diff --git a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
index 75dafb55a..6989e7d7b 100644
--- a/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/AccountNotifications.test.tsx.snap
@@ -6,471 +6,493 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_o_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_t_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
               >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="octocat"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="@octocat"
+                    >
+                      @octocat
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    0
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    0
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_u_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
                   height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
                   width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
                 >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_v_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
               >
-                0
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_10_-loading-announcement"
+                aria-label="No notifications for account"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="No notifications for account"
+                type="button"
               >
-                 (
-                0
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_p_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_q_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_r_-loading-announcement"
-            aria-label="No notifications for account"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
-            data-variant="invisible"
-            title="No notifications for account"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-left"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
           <div
             class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🔥"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f525.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Error title
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Error description
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_o_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="account-profile"
-        data-variant="invisible"
-        title="Open account profile"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
               data-align="center"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="condensed"
-              data-justify="start"
+              data-justify="center"
               data-padding="none"
-              data-testid="avatar"
               data-wrap="nowrap"
             >
-              <img
-                alt="octocat"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="16"
-                src="https://avatars.githubusercontent.com/u/583231?v=4"
-                style="--avatarSize-regular: 16px;"
-                width="16"
-              />
               <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="@octocat"
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🔥"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f525.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  Error title
+                </div>
+              </div>
+              <div
+                class="text-center"
               >
-                @octocat
+                Error description
               </div>
             </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
-            >
-              0
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
-            >
-               (
-              0
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_p_-loading-announcement"
-          aria-label="My issues ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-issues"
-          data-variant="invisible"
-          title="My issues ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_q_-loading-announcement"
-          aria-label="My pull requests ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-pull-requests"
-          data-variant="invisible"
-          title="My pull requests ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_r_-loading-announcement"
-          aria-label="No notifications for account"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-toggle"
-          data-variant="invisible"
-          title="No notifications for account"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-left"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-            />
-          </svg>
-        </button>
+          </div>
+        </div>
       </div>
     </div>
+  </body>,
+  "container": <div>
     <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="spacious"
+          class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
+          data-align="stretch"
+          data-direction="horizontal"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
-          <div
-            class="text-7xl"
-          >
-            <img
-              alt="🔥"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f525.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+          <button
+            aria-describedby="_r_t_-loading-announcement"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
+            data-loading="false"
+            data-no-visuals="true"
+            data-size="medium"
+            data-testid="account-profile"
+            data-variant="invisible"
+            title="Open account profile"
+            type="button"
           >
-            Error title
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
+            >
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="octocat"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="16"
+                    src="https://avatars.githubusercontent.com/u/583231?v=4"
+                    style="--avatarSize-regular: 16px;"
+                    width="16"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="@octocat"
+                  >
+                    @octocat
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  0
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  0
+                  )
+                </span>
+              </span>
+            </span>
+          </button>
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <button
+              aria-describedby="_r_u_-loading-announcement"
+              aria-label="My issues ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-issues"
+              data-variant="invisible"
+              title="My issues ↗"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_v_-loading-announcement"
+              aria-label="My pull requests ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-pull-requests"
+              data-variant="invisible"
+              title="My pull requests ↗"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_10_-loading-announcement"
+              aria-label="No notifications for account"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-toggle"
+              data-variant="invisible"
+              title="No notifications for account"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-left"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+                />
+              </svg>
+            </button>
           </div>
         </div>
         <div
-          class="text-center"
+          class="prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="vertical"
+          data-justify="center"
+          data-padding="spacious"
+          data-wrap="nowrap"
         >
-          Error description
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🔥"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f525.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                Error title
+              </div>
+            </div>
+            <div
+              class="text-center"
+            >
+              Error description
+            </div>
+          </div>
         </div>
       </div>
     </div>
@@ -535,472 +557,494 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_k_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_o_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
               >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="octocat"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="@octocat"
+                    >
+                      @octocat
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    0
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    0
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_p_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
                   height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
                   width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
                 >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_q_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
               >
-                0
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_r_-loading-announcement"
+                aria-label="No notifications for account"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="No notifications for account"
+                type="button"
               >
-                 (
-                0
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-left"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div
+            class="h-screen prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-justify="center"
+            data-padding="spacious"
+            data-wrap="nowrap"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="vertical"
+                data-gap="spacious"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="text-7xl"
+                >
+                  <img
+                    alt="🔥"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f525.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  Error title
+                </div>
+              </div>
+              <div
+                class="text-center"
+              >
+                Error description
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
+          data-align="stretch"
+          data-direction="horizontal"
+          data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_l_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            aria-describedby="_r_o_-loading-announcement"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
+            data-size="medium"
+            data-testid="account-profile"
             data-variant="invisible"
-            title="My issues ↗"
+            title="Open account profile"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="octocat"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="16"
+                    src="https://avatars.githubusercontent.com/u/583231?v=4"
+                    style="--avatarSize-regular: 16px;"
+                    width="16"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="@octocat"
+                  >
+                    @octocat
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  0
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  0
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-          <button
-            aria-describedby="_r_m_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <button
+              aria-describedby="_r_p_-loading-announcement"
+              aria-label="My issues ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-issues"
+              data-variant="invisible"
+              title="My issues ↗"
+              type="button"
             >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_n_-loading-announcement"
-            aria-label="No notifications for account"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
-            data-variant="invisible"
-            title="No notifications for account"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_q_-loading-announcement"
+              aria-label="My pull requests ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-pull-requests"
+              data-variant="invisible"
+              title="My pull requests ↗"
+              type="button"
             >
-              <path
-                d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_r_-loading-announcement"
+              aria-label="No notifications for account"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-toggle"
+              data-variant="invisible"
+              title="No notifications for account"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-left"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+                />
+              </svg>
+            </button>
+          </div>
         </div>
-      </div>
-      <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="condensed"
           data-justify="center"
-          data-padding="none"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
             class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="spacious"
-            data-justify="start"
+            data-gap="condensed"
+            data-justify="center"
             data-padding="none"
             data-wrap="nowrap"
-          >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🔥"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f525.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              Error title
-            </div>
-          </div>
-          <div
-            class="text-center"
-          >
-            Error description
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-account-error prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_k_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="account-profile"
-        data-variant="invisible"
-        title="Open account profile"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
               data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
+              data-direction="vertical"
+              data-gap="spacious"
               data-justify="start"
               data-padding="none"
-              data-testid="avatar"
               data-wrap="nowrap"
             >
-              <img
-                alt="octocat"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="16"
-                src="https://avatars.githubusercontent.com/u/583231?v=4"
-                style="--avatarSize-regular: 16px;"
-                width="16"
-              />
               <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="@octocat"
+                class="text-7xl"
+              >
+                <img
+                  alt="🔥"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f525.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
               >
-                @octocat
+                Error title
               </div>
             </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
-            >
-              0
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+            <div
+              class="text-center"
             >
-               (
-              0
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_l_-loading-announcement"
-          aria-label="My issues ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-issues"
-          data-variant="invisible"
-          title="My issues ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_m_-loading-announcement"
-          aria-label="My pull requests ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-pull-requests"
-          data-variant="invisible"
-          title="My pull requests ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_n_-loading-announcement"
-          aria-label="No notifications for account"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-toggle"
-          data-variant="invisible"
-          title="No notifications for account"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-left"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-            />
-          </svg>
-        </button>
-      </div>
-    </div>
-    <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="text-7xl"
-          >
-            <img
-              alt="🔥"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f525.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
-          >
-            Error title
+              Error description
+            </div>
           </div>
         </div>
-        <div
-          class="text-center"
-        >
-          Error description
-        </div>
       </div>
     </div>
   </div>,
@@ -1064,263 +1108,42 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_4_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
-          >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
-              >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
-                >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_5_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_6_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_7_-loading-announcement"
-            aria-label="Hide account notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
-            data-variant="invisible"
-            title="Hide account notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-      <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_8_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_8_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
+            class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
             data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
+            data-direction="horizontal"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="py-0.5"
+            <button
+              aria-describedby="_r_6_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
+                data-component="buttonContent"
               >
-                <button
-                  class="text-xs font-medium"
-                  data-testid="view-repository"
-                  title="Open repository ↗"
-                  type="button"
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
                 >
                   <div
                     class="prc-Stack-Stack-WJVsK"
@@ -1333,843 +1156,854 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                     data-wrap="nowrap"
                   >
                     <img
-                      alt="gitify-app/notifications-test"
+                      alt="octocat"
                       class="prc-Avatar-Avatar-ZRS-m"
                       data-component="Avatar"
-                      height="14"
-                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                      style="--avatarSize-regular: 14px;"
-                      width="14"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
                     />
                     <div
                       class="prc-Truncate-Truncate-A9Wn6"
                       data-inline="true"
                       style="--truncate-max-width: 280px;"
-                      title="gitify-app/notifications-test"
+                      title="@octocat"
                     >
-                      gitify-app/notifications-test
+                      @octocat
                     </div>
                   </div>
-                </button>
-                <div
-                  class="text-xxs opacity-50"
-                />
-              </div>
-            </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
             <div
-              class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-              data-align="start"
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
               data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
+              data-gap="none"
+              data-justify="start"
               data-padding="none"
-              data-testid="notification-row"
               data-wrap="nowrap"
-              title="I am a robot and this is a test!"
             >
-              <span
-                class="truncate prc-Text-Text-0ima0"
+              <button
+                aria-describedby="_r_7_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
               >
-                I am a robot and this is a test!
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-              />
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_8_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_9_-loading-announcement"
+                aria-label="Hide account notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="Hide account notifications"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
             </div>
+          </div>
+          <div
+            class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+            id="138661096"
+          >
             <div
-              class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-wrap="wrap"
+              data-wrap="nowrap"
             >
               <button
-                data-testid="view-profile"
-                title="gitify-app"
+                aria-describedby="_r_a_"
                 type="button"
               >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
+                <svg
+                  aria-label="Open Issue"
+                  class="octicon octicon-issue-opened text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="18"
+                  overflow="visible"
+                  role="img"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="18"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
-                </div>
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
               </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_a_"
+                popover="auto"
+                role="tooltip"
+              >
+                Open Issue
+              </span>
               <div
-                class="prc-Stack-Stack-WJVsK"
+                class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
                 data-align="stretch"
-                data-direction="horizontal"
+                data-direction="vertical"
                 data-gap="none"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="pr-1 prc-Text-Text-0ima0"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="octocat approved these changes"
+                <div
+                  class="py-0.5"
                 >
                   <div
                     class="prc-Stack-Stack-WJVsK"
                     data-align="center"
                     data-direction="horizontal"
-                    data-gap="none"
+                    data-gap="condensed"
                     data-justify="start"
                     data-padding="none"
                     data-wrap="nowrap"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-check text-gitify-icon-open"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
-                    >
-                      <path
-                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                      />
-                    </svg>
-                    <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                    <button
+                      class="text-xs font-medium"
+                      data-testid="view-repository"
+                      title="Open repository ↗"
+                      type="button"
                     >
-                      1
-                    </span>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="condensed"
+                        data-justify="start"
+                        data-padding="none"
+                        data-testid="avatar"
+                        data-wrap="nowrap"
+                      >
+                        <img
+                          alt="gitify-app/notifications-test"
+                          class="prc-Avatar-Avatar-ZRS-m"
+                          data-component="Avatar"
+                          height="14"
+                          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                          style="--avatarSize-regular: 14px;"
+                          width="14"
+                        />
+                        <div
+                          class="prc-Truncate-Truncate-A9Wn6"
+                          data-inline="true"
+                          style="--truncate-max-width: 280px;"
+                          title="gitify-app/notifications-test"
+                        >
+                          gitify-app/notifications-test
+                        </div>
+                      </div>
+                    </button>
+                    <div
+                      class="text-xxs opacity-50"
+                    />
                   </div>
-                </span>
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="gitify-app requested changes"
-                >
-                  <div
+                </div>
+                <div
+                  class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                  data-align="start"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="space-between"
+                  data-padding="none"
+                  data-testid="notification-row"
+                  data-wrap="nowrap"
+                  title="I am a robot and this is a test!"
+                >
+                  <span
+                    class="truncate prc-Text-Text-0ima0"
+                  >
+                    I am a robot and this is a test!
+                  </span>
+                  <span
+                    class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                  />
+                </div>
+                <div
+                  class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="wrap"
+                >
+                  <button
+                    data-testid="view-profile"
+                    title="gitify-app"
+                    type="button"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                    </div>
+                  </button>
+                  <div
                     class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
+                    data-align="stretch"
                     data-direction="horizontal"
                     data-gap="none"
                     data-justify="start"
                     data-padding="none"
                     data-wrap="nowrap"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-file-diff text-gitify-icon-closed"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
-                    >
-                      <path
-                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                      />
-                    </svg>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="pr-1 prc-Text-Text-0ima0"
+                      title="You're watching the repository."
                     >
-                      1
+                      Updated
                     </span>
+                    <relative-time
+                      datetime="2017-05-20T17:51:57.000Z"
+                    >
+                      May 20, 2017
+                    </relative-time>
                   </div>
-                </span>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_9_-loading-announcement"
-            aria-label="Mark as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-done"
-            data-variant="invisible"
-            title="Mark as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_a_-loading-announcement"
-            aria-label="Mark as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-read"
-            data-variant="invisible"
-            title="Mark as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_b_-loading-announcement"
-            aria-label="Unsubscribe from thread"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-      <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="148827438"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_c_"
-            type="button"
-          >
-            <svg
-              aria-label="Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-muted"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_c_"
-            popover="auto"
-            role="tooltip"
-          >
-            Issue
-          </span>
-          <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="py-0.5"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <button
-                  class="text-xs font-medium"
-                  data-testid="view-repository"
-                  title="Open repository ↗"
-                  type="button"
-                >
                   <div
-                    class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="condensed"
-                    data-justify="start"
-                    data-padding="none"
-                    data-testid="avatar"
-                    data-wrap="nowrap"
+                    class="flex gap-1"
                   >
-                    <img
-                      alt="gitify-app/notifications-test"
-                      class="prc-Avatar-Avatar-ZRS-m"
-                      data-component="Avatar"
-                      height="14"
-                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                      style="--avatarSize-regular: 14px;"
-                      width="14"
-                    />
-                    <div
-                      class="prc-Truncate-Truncate-A9Wn6"
-                      data-inline="true"
-                      style="--truncate-max-width: 280px;"
-                      title="gitify-app/notifications-test"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="octocat approved these changes"
                     >
-                      gitify-app/notifications-test
-                    </div>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="gitify-app requested changes"
+                    >
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
                   </div>
-                </button>
-                <div
-                  class="text-xxs opacity-50"
-                />
+                </div>
               </div>
             </div>
             <div
-              class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-              data-align="start"
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+              data-align="center"
               data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
+              data-gap="none"
+              data-justify="start"
               data-padding="none"
-              data-testid="notification-row"
               data-wrap="nowrap"
-              title="Improve the UI"
             >
-              <span
-                class="truncate prc-Text-Text-0ima0"
+              <button
+                aria-describedby="_r_b_-loading-announcement"
+                aria-label="Mark as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-done"
+                data-variant="invisible"
+                title="Mark as done"
+                type="button"
               >
-                Improve the UI
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-              />
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_c_-loading-announcement"
+                aria-label="Mark as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-read"
+                data-variant="invisible"
+                title="Mark as read"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_d_-loading-announcement"
+                aria-label="Unsubscribe from thread"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-unsubscribe-from-thread"
+                data-variant="invisible"
+                title="Unsubscribe from thread"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell-slash"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  />
+                </svg>
+              </button>
             </div>
+          </div>
+          <div
+            class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+            id="148827438"
+          >
             <div
-              class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-wrap="wrap"
+              data-wrap="nowrap"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <button
+                aria-describedby="_r_e_"
+                type="button"
               >
                 <svg
-                  aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  aria-label="Issue"
+                  class="octicon octicon-issue-opened text-gitify-icon-muted"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
-                  height="14"
+                  height="18"
                   overflow="visible"
+                  role="img"
                   style="vertical-align: text-bottom;"
                   viewBox="0 0 16 16"
-                  width="14"
+                  width="18"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                   />
                 </svg>
-              </div>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_e_"
+                popover="auto"
+                role="tooltip"
+              >
+                Issue
+              </span>
               <div
-                class="prc-Stack-Stack-WJVsK"
+                class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
                 data-align="stretch"
-                data-direction="horizontal"
+                data-direction="vertical"
                 data-gap="none"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="pr-1 prc-Text-Text-0ima0"
-                  title="You created the thread."
-                >
-                  Authored
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:06:34.000Z"
+                <div
+                  class="py-0.5"
                 >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              />
-            </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_d_-loading-announcement"
-            aria-label="Mark as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-done"
-            data-variant="invisible"
-            title="Mark as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_e_-loading-announcement"
-            aria-label="Mark as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-read"
-            data-variant="invisible"
-            title="Mark as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_f_-loading-announcement"
-            aria-label="Unsubscribe from thread"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_4_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="account-profile"
-        data-variant="invisible"
-        title="Open account profile"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
-          >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <button
+                      class="text-xs font-medium"
+                      data-testid="view-repository"
+                      title="Open repository ↗"
+                      type="button"
+                    >
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="condensed"
+                        data-justify="start"
+                        data-padding="none"
+                        data-testid="avatar"
+                        data-wrap="nowrap"
+                      >
+                        <img
+                          alt="gitify-app/notifications-test"
+                          class="prc-Avatar-Avatar-ZRS-m"
+                          data-component="Avatar"
+                          height="14"
+                          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                          style="--avatarSize-regular: 14px;"
+                          width="14"
+                        />
+                        <div
+                          class="prc-Truncate-Truncate-A9Wn6"
+                          data-inline="true"
+                          style="--truncate-max-width: 280px;"
+                          title="gitify-app/notifications-test"
+                        >
+                          gitify-app/notifications-test
+                        </div>
+                      </div>
+                    </button>
+                    <div
+                      class="text-xxs opacity-50"
+                    />
+                  </div>
+                </div>
+                <div
+                  class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                  data-align="start"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="space-between"
+                  data-padding="none"
+                  data-testid="notification-row"
+                  data-wrap="nowrap"
+                  title="Improve the UI"
+                >
+                  <span
+                    class="truncate prc-Text-Text-0ima0"
+                  >
+                    Improve the UI
+                  </span>
+                  <span
+                    class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                  />
+                </div>
+                <div
+                  class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="wrap"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-feed-person"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="14"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="14"
+                    >
+                      <path
+                        d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                      />
+                    </svg>
+                  </div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="stretch"
+                    data-direction="horizontal"
+                    data-gap="none"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <span
+                      class="pr-1 prc-Text-Text-0ima0"
+                      title="You created the thread."
+                    >
+                      Authored
+                    </span>
+                    <relative-time
+                      datetime="2017-05-20T17:06:34.000Z"
+                    >
+                      May 20, 2017
+                    </relative-time>
+                  </div>
+                  <div
+                    class="flex gap-1"
+                  />
+                </div>
+              </div>
+            </div>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
-              data-gap="condensed"
+              data-gap="none"
               data-justify="start"
               data-padding="none"
-              data-testid="avatar"
               data-wrap="nowrap"
             >
-              <img
-                alt="octocat"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="16"
-                src="https://avatars.githubusercontent.com/u/583231?v=4"
-                style="--avatarSize-regular: 16px;"
-                width="16"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="@octocat"
+              <button
+                aria-describedby="_r_f_-loading-announcement"
+                aria-label="Mark as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-done"
+                data-variant="invisible"
+                title="Mark as done"
+                type="button"
               >
-                @octocat
-              </div>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_g_-loading-announcement"
+                aria-label="Mark as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-read"
+                data-variant="invisible"
+                title="Mark as read"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_h_-loading-announcement"
+                aria-label="Unsubscribe from thread"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-unsubscribe-from-thread"
+                data-variant="invisible"
+                title="Unsubscribe from thread"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell-slash"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  />
+                </svg>
+              </button>
             </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
-            >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
-            >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_5_-loading-announcement"
-          aria-label="My issues ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-issues"
-          data-variant="invisible"
-          title="My issues ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_6_-loading-announcement"
-          aria-label="My pull requests ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-pull-requests"
-          data-variant="invisible"
-          title="My pull requests ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_7_-loading-announcement"
-          aria-label="Hide account notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-toggle"
-          data-variant="invisible"
-          title="Hide account notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+          </div>
+        </div>
       </div>
     </div>
+  </body>,
+  "container": <div>
     <div
-      class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-      id="138661096"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_8_"
-          type="button"
-        >
-          <svg
-            aria-label="Open Issue"
-            class="octicon octicon-issue-opened text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="18"
-            overflow="visible"
-            role="img"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="18"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_8_"
-          popover="auto"
-          role="tooltip"
-        >
-          Open Issue
-        </span>
         <div
-          class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
+          class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
           data-align="stretch"
-          data-direction="vertical"
-          data-gap="none"
+          data-direction="horizontal"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
-          <div
-            class="py-0.5"
+          <button
+            aria-describedby="_r_6_-loading-announcement"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
+            data-loading="false"
+            data-no-visuals="true"
+            data-size="medium"
+            data-testid="account-profile"
+            data-variant="invisible"
+            title="Open account profile"
+            type="button"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
               data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              data-component="buttonContent"
             >
-              <button
-                class="text-xs font-medium"
-                data-testid="view-repository"
-                title="Open repository ↗"
-                type="button"
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
               >
                 <div
                   class="prc-Stack-Stack-WJVsK"
@@ -2182,580 +2016,812 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
                   data-wrap="nowrap"
                 >
                   <img
-                    alt="gitify-app/notifications-test"
+                    alt="octocat"
                     class="prc-Avatar-Avatar-ZRS-m"
                     data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
+                    height="16"
+                    src="https://avatars.githubusercontent.com/u/583231?v=4"
+                    style="--avatarSize-regular: 16px;"
+                    width="16"
                   />
                   <div
                     class="prc-Truncate-Truncate-A9Wn6"
                     data-inline="true"
                     style="--truncate-max-width: 280px;"
-                    title="gitify-app/notifications-test"
+                    title="@octocat"
                   >
-                    gitify-app/notifications-test
+                    @octocat
                   </div>
                 </div>
-              </button>
-              <div
-                class="text-xxs opacity-50"
-              />
-            </div>
-          </div>
-          <div
-            class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-            data-align="start"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="space-between"
-            data-padding="none"
-            data-testid="notification-row"
-            data-wrap="nowrap"
-            title="I am a robot and this is a test!"
-          >
-            <span
-              class="truncate prc-Text-Text-0ima0"
-            >
-              I am a robot and this is a test!
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
+              </span>
             </span>
-            <span
-              class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-            />
-          </div>
+          </button>
           <div
-            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
-            data-gap="condensed"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
-            data-wrap="wrap"
+            data-wrap="nowrap"
           >
             <button
-              data-testid="view-profile"
-              title="gitify-app"
+              aria-describedby="_r_7_-loading-announcement"
+              aria-label="My issues ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-issues"
+              data-variant="invisible"
+              title="My issues ↗"
               type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                <img
-                  alt="gitify-app"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 14px;"
-                  width="14"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-              </div>
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_8_-loading-announcement"
+              aria-label="My pull requests ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-pull-requests"
+              data-variant="invisible"
+              title="My pull requests ↗"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_9_-loading-announcement"
+              aria-label="Hide account notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-toggle"
+              data-variant="invisible"
+              title="Hide account notifications"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div
+          class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+          id="138661096"
+        >
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <button
+              aria-describedby="_r_a_"
+              type="button"
+            >
+              <svg
+                aria-label="Open Issue"
+                class="octicon octicon-issue-opened text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="18"
+                overflow="visible"
+                role="img"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="18"
+              >
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
             </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_a_"
+              popover="auto"
+              role="tooltip"
+            >
+              Open Issue
+            </span>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
               data-align="stretch"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="pr-1 prc-Text-Text-0ima0"
-                title="You're watching the repository."
-              >
-                Updated
-              </span>
-              <relative-time
-                datetime="2017-05-20T17:51:57.000Z"
-              >
-                May 20, 2017
-              </relative-time>
-            </div>
-            <div
-              class="flex gap-1"
-            >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <div
+                class="py-0.5"
               >
                 <div
                   class="prc-Stack-Stack-WJVsK"
                   data-align="center"
                   data-direction="horizontal"
-                  data-gap="none"
+                  data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  <button
+                    class="text-xs font-medium"
+                    data-testid="view-repository"
+                    title="Open repository ↗"
+                    type="button"
                   >
-                    1
-                  </span>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app/notifications-test"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                      <div
+                        class="prc-Truncate-Truncate-A9Wn6"
+                        data-inline="true"
+                        style="--truncate-max-width: 280px;"
+                        title="gitify-app/notifications-test"
+                      >
+                        gitify-app/notifications-test
+                      </div>
+                    </div>
+                  </button>
+                  <div
+                    class="text-xxs opacity-50"
+                  />
                 </div>
-              </span>
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+              </div>
+              <div
+                class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                data-align="start"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="space-between"
+                data-padding="none"
+                data-testid="notification-row"
+                data-wrap="nowrap"
+                title="I am a robot and this is a test!"
+              >
+                <span
+                  class="truncate prc-Text-Text-0ima0"
+                >
+                  I am a robot and this is a test!
+                </span>
+                <span
+                  class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                />
+              </div>
+              <div
+                class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="wrap"
               >
+                <button
+                  data-testid="view-profile"
+                  title="gitify-app"
+                  type="button"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="14"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 14px;"
+                      width="14"
+                    />
+                  </div>
+                </button>
                 <div
                   class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
+                  data-align="stretch"
                   data-direction="horizontal"
                   data-gap="none"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="pr-1 prc-Text-Text-0ima0"
+                    title="You're watching the repository."
                   >
-                    1
+                    Updated
                   </span>
+                  <relative-time
+                    datetime="2017-05-20T17:51:57.000Z"
+                  >
+                    May 20, 2017
+                  </relative-time>
                 </div>
-              </span>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_9_-loading-announcement"
-          aria-label="Mark as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-done"
-          data-variant="invisible"
-          title="Mark as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_a_-loading-announcement"
-          aria-label="Mark as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-read"
-          data-variant="invisible"
-          title="Mark as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_b_-loading-announcement"
-          aria-label="Unsubscribe from thread"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-unsubscribe-from-thread"
-          data-variant="invisible"
-          title="Unsubscribe from thread"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell-slash"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-            />
-          </svg>
-        </button>
-      </div>
-    </div>
-    <div
-      class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-      id="148827438"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_c_"
-          type="button"
-        >
-          <svg
-            aria-label="Issue"
-            class="octicon octicon-issue-opened text-gitify-icon-muted"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="18"
-            overflow="visible"
-            role="img"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="18"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_c_"
-          popover="auto"
-          role="tooltip"
-        >
-          Issue
-        </span>
-        <div
-          class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="py-0.5"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <button
-                class="text-xs font-medium"
-                data-testid="view-repository"
-                title="Open repository ↗"
-                type="button"
-              >
                 <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
+                  class="flex gap-1"
                 >
-                  <img
-                    alt="gitify-app/notifications-test"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="gitify-app/notifications-test"
+                  <span
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="octocat approved these changes"
                   >
-                    gitify-app/notifications-test
-                  </div>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-check text-gitify-icon-open"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
+                  </span>
+                  <span
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="gitify-app requested changes"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-file-diff text-gitify-icon-closed"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
+                  </span>
                 </div>
-              </button>
-              <div
-                class="text-xxs opacity-50"
-              />
+              </div>
             </div>
           </div>
           <div
-            class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-            data-align="start"
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+            data-align="center"
             data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="space-between"
+            data-gap="none"
+            data-justify="start"
             data-padding="none"
-            data-testid="notification-row"
             data-wrap="nowrap"
-            title="Improve the UI"
           >
-            <span
-              class="truncate prc-Text-Text-0ima0"
+            <button
+              aria-describedby="_r_b_-loading-announcement"
+              aria-label="Mark as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-done"
+              data-variant="invisible"
+              title="Mark as done"
+              type="button"
             >
-              Improve the UI
-            </span>
-            <span
-              class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-            />
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_c_-loading-announcement"
+              aria-label="Mark as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-read"
+              data-variant="invisible"
+              title="Mark as read"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_d_-loading-announcement"
+              aria-label="Unsubscribe from thread"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-unsubscribe-from-thread"
+              data-variant="invisible"
+              title="Unsubscribe from thread"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell-slash"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                />
+              </svg>
+            </button>
           </div>
+        </div>
+        <div
+          class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+          id="148827438"
+        >
           <div
-            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-wrap="wrap"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_e_"
+              type="button"
             >
               <svg
-                aria-hidden="true"
-                class="octicon octicon-feed-person"
+                aria-label="Issue"
+                class="octicon octicon-issue-opened text-gitify-icon-muted"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
-                height="14"
+                height="18"
                 overflow="visible"
+                role="img"
                 style="vertical-align: text-bottom;"
                 viewBox="0 0 16 16"
-                width="14"
+                width="18"
               >
                 <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
                 />
               </svg>
-            </div>
+            </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_e_"
+              popover="auto"
+              role="tooltip"
+            >
+              Issue
+            </span>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
               data-align="stretch"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="pr-1 prc-Text-Text-0ima0"
-                title="You created the thread."
+              <div
+                class="py-0.5"
               >
-                Authored
-              </span>
-              <relative-time
-                datetime="2017-05-20T17:06:34.000Z"
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <button
+                    class="text-xs font-medium"
+                    data-testid="view-repository"
+                    title="Open repository ↗"
+                    type="button"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app/notifications-test"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                      <div
+                        class="prc-Truncate-Truncate-A9Wn6"
+                        data-inline="true"
+                        style="--truncate-max-width: 280px;"
+                        title="gitify-app/notifications-test"
+                      >
+                        gitify-app/notifications-test
+                      </div>
+                    </div>
+                  </button>
+                  <div
+                    class="text-xxs opacity-50"
+                  />
+                </div>
+              </div>
+              <div
+                class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                data-align="start"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="space-between"
+                data-padding="none"
+                data-testid="notification-row"
+                data-wrap="nowrap"
+                title="Improve the UI"
               >
-                May 20, 2017
-              </relative-time>
+                <span
+                  class="truncate prc-Text-Text-0ima0"
+                >
+                  Improve the UI
+                </span>
+                <span
+                  class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                />
+              </div>
+              <div
+                class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="wrap"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="14"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="14"
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
+                </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <span
+                    class="pr-1 prc-Text-Text-0ima0"
+                    title="You created the thread."
+                  >
+                    Authored
+                  </span>
+                  <relative-time
+                    datetime="2017-05-20T17:06:34.000Z"
+                  >
+                    May 20, 2017
+                  </relative-time>
+                </div>
+                <div
+                  class="flex gap-1"
+                />
+              </div>
             </div>
-            <div
-              class="flex gap-1"
-            />
           </div>
-        </div>
-      </div>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_d_-loading-announcement"
-          aria-label="Mark as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-done"
-          data-variant="invisible"
-          title="Mark as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_e_-loading-announcement"
-          aria-label="Mark as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-read"
-          data-variant="invisible"
-          title="Mark as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_f_-loading-announcement"
-          aria-label="Unsubscribe from thread"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-unsubscribe-from-thread"
-          data-variant="invisible"
-          title="Unsubscribe from thread"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell-slash"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <path
-              d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-            />
-          </svg>
-        </button>
+            <button
+              aria-describedby="_r_f_-loading-announcement"
+              aria-label="Mark as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-done"
+              data-variant="invisible"
+              title="Mark as done"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_g_-loading-announcement"
+              aria-label="Mark as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-read"
+              data-variant="invisible"
+              title="Mark as read"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_h_-loading-announcement"
+              aria-label="Unsubscribe from thread"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-unsubscribe-from-thread"
+              data-variant="invisible"
+              title="Unsubscribe from thread"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell-slash"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -2819,382 +2885,404 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_0_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_1_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
               >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="octocat"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="@octocat"
+                    >
+                      @octocat
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_2_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
                   height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
                   width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
                 >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_3_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
               >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_4_-loading-announcement"
+                aria-label="Hide account notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="Hide account notifications"
+                type="button"
               >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div>
+            Repository Notifications
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
           <button
             aria-describedby="_r_1_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_2_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_3_-loading-announcement"
-            aria-label="Hide account notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
+            data-size="medium"
+            data-testid="account-profile"
             data-variant="invisible"
-            title="Hide account notifications"
+            title="Open account profile"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="octocat"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="16"
+                    src="https://avatars.githubusercontent.com/u/583231?v=4"
+                    style="--avatarSize-regular: 16px;"
+                    width="16"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="@octocat"
+                  >
+                    @octocat
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-        </div>
-      </div>
-      <div>
-        Repository Notifications
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_0_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="account-profile"
-        data-variant="invisible"
-        title="Open account profile"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_2_-loading-announcement"
+              aria-label="My issues ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-issues"
+              data-variant="invisible"
+              title="My issues ↗"
+              type="button"
             >
-              <img
-                alt="octocat"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
                 height="16"
-                src="https://avatars.githubusercontent.com/u/583231?v=4"
-                style="--avatarSize-regular: 16px;"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
                 width="16"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="@octocat"
               >
-                @octocat
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_3_-loading-announcement"
+              aria-label="My pull requests ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-pull-requests"
+              data-variant="invisible"
+              title="My pull requests ↗"
+              type="button"
             >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_4_-loading-announcement"
+              aria-label="Hide account notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-toggle"
+              data-variant="invisible"
+              title="Hide account notifications"
+              type="button"
             >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_1_-loading-announcement"
-          aria-label="My issues ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-issues"
-          data-variant="invisible"
-          title="My issues ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_2_-loading-announcement"
-          aria-label="My pull requests ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-pull-requests"
-          data-variant="invisible"
-          title="My pull requests ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_3_-loading-announcement"
-          aria-label="Hide account notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-toggle"
-          data-variant="invisible"
-          title="Hide account notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div>
+          Repository Notifications
+        </div>
       </div>
     </div>
-    <div>
-      Repository Notifications
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -3256,460 +3344,482 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should rende
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_g_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <button
+              aria-describedby="_r_j_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
+            >
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
+                data-align="center"
+                data-component="buttonContent"
+              >
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="octocat"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="@octocat"
+                    >
+                      @octocat
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    0
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    0
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_k_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_l_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_m_-loading-announcement"
+                aria-label="No notifications for account"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="No notifications for account"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-left"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
             data-align="center"
-            data-component="buttonContent"
+            data-direction="vertical"
+            data-justify="center"
+            data-padding="spacious"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="center"
+              data-padding="none"
+              data-wrap="nowrap"
             >
               <div
                 class="prc-Stack-Stack-WJVsK"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
+                data-direction="vertical"
+                data-gap="spacious"
                 data-justify="start"
                 data-padding="none"
-                data-testid="avatar"
                 data-wrap="nowrap"
               >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
                 <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
+                  class="text-7xl"
                 >
-                  @octocat
+                  <img
+                    alt="🎊"
+                    class="emoji"
+                    draggable="false"
+                    src="/mock/images/assets/1f38a.svg"
+                  />
+                </div>
+                <div
+                  class="text-xl font-semibold"
+                >
+                  No new  notifications
                 </div>
               </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
-              >
-                0
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
-              >
-                 (
-                0
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
-          <button
-            aria-describedby="_r_h_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_i_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
           <button
             aria-describedby="_r_j_-loading-announcement"
-            aria-label="No notifications for account"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
+            data-size="medium"
+            data-testid="account-profile"
             data-variant="invisible"
-            title="No notifications for account"
+            title="Open account profile"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="octocat"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="16"
+                    src="https://avatars.githubusercontent.com/u/583231?v=4"
+                    style="--avatarSize-regular: 16px;"
+                    width="16"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="@octocat"
+                  >
+                    @octocat
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  0
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  0
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-        </div>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="condensed"
-          data-justify="center"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
             data-align="center"
-            data-direction="vertical"
-            data-gap="spacious"
+            data-direction="horizontal"
+            data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <div
-              class="text-7xl"
-            >
-              <img
-                alt="🎊"
-                class="emoji"
-                draggable="false"
-                src="/mock/images/assets/1f38a.svg"
-              />
-            </div>
-            <div
-              class="text-xl font-semibold"
-            >
-              No new  notifications
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_g_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="account-profile"
-        data-variant="invisible"
-        title="Open account profile"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_k_-loading-announcement"
+              aria-label="My issues ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-issues"
+              data-variant="invisible"
+              title="My issues ↗"
+              type="button"
             >
-              <img
-                alt="octocat"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
                 height="16"
-                src="https://avatars.githubusercontent.com/u/583231?v=4"
-                style="--avatarSize-regular: 16px;"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
                 width="16"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="@octocat"
               >
-                @octocat
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_l_-loading-announcement"
+              aria-label="My pull requests ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-pull-requests"
+              data-variant="invisible"
+              title="My pull requests ↗"
+              type="button"
             >
-              0
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_m_-loading-announcement"
+              aria-label="No notifications for account"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-toggle"
+              data-variant="invisible"
+              title="No notifications for account"
+              type="button"
             >
-               (
-              0
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_h_-loading-announcement"
-          aria-label="My issues ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-issues"
-          data-variant="invisible"
-          title="My issues ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_i_-loading-announcement"
-          aria-label="My pull requests ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-pull-requests"
-          data-variant="invisible"
-          title="My pull requests ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_j_-loading-announcement"
-          aria-label="No notifications for account"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-toggle"
-          data-variant="invisible"
-          title="No notifications for account"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-left"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
-            />
-          </svg>
-        </button>
-      </div>
-    </div>
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-gap="condensed"
-        data-justify="center"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-left"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M9.78 12.78a.75.75 0 0 1-1.06 0L4.47 8.53a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L6.06 8l3.72 3.72a.75.75 0 0 1 0 1.06Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
         <div
           class="prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="spacious"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
           <div
-            class="text-7xl"
-          >
-            <img
-              alt="🎊"
-              class="emoji"
-              draggable="false"
-              src="/mock/images/assets/1f38a.svg"
-            />
-          </div>
-          <div
-            class="text-xl font-semibold"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-gap="condensed"
+            data-justify="center"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            No new  notifications
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-gap="spacious"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="text-7xl"
+              >
+                <img
+                  alt="🎊"
+                  class="emoji"
+                  draggable="false"
+                  src="/mock/images/assets/1f38a.svg"
+                />
+              </div>
+              <div
+                class="text-xl font-semibold"
+              >
+                No new  notifications
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -3775,568 +3885,601 @@ exports[`renderer/components/notifications/AccountNotifications.tsx should toggl
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_18_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_1h_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
+              >
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="octocat"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="@octocat"
+                    >
+                      @octocat
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_1i_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_1j_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_1k_-loading-announcement"
+                aria-label="Show account notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="Show account notifications"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-right"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            <button
+              aria-describedby="_r_1m_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="account-profile"
+              data-variant="invisible"
+              title="Open account profile"
+              type="button"
+            >
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
+                data-align="center"
+                data-component="buttonContent"
+              >
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="octocat"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="16"
+                      src="https://avatars.githubusercontent.com/u/583231?v=4"
+                      style="--avatarSize-regular: 16px;"
+                      width="16"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="@octocat"
+                    >
+                      @octocat
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_1n_-loading-announcement"
+                aria-label="My issues ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-issues"
+                data-variant="invisible"
+                title="My issues ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-issue-opened"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_1o_-loading-announcement"
+                aria-label="My pull requests ↗"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-pull-requests"
+                data-variant="invisible"
+                title="My pull requests ↗"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-git-pull-request"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_1p_-loading-announcement"
+                aria-label="Hide account notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="account-toggle"
+                data-variant="invisible"
+                title="Hide account notifications"
+                type="button"
               >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
                   height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
                   width="16"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
                 >
-                  @octocat
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
-              >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
-              >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div>
+            Repository Notifications
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_19_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_1a_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_1b_-loading-announcement"
-            aria-label="Show account notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            aria-describedby="_r_1m_-loading-announcement"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
+            data-size="medium"
+            data-testid="account-profile"
             data-variant="invisible"
-            title="Show account notifications"
+            title="Open account profile"
             type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-right"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-    </div>
-    <div>
-      <div
-        class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_1c_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="account-profile"
-          data-variant="invisible"
-          title="Open account profile"
-          type="button"
-        >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
           >
             <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
               >
-                <img
-                  alt="octocat"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="16"
-                  src="https://avatars.githubusercontent.com/u/583231?v=4"
-                  style="--avatarSize-regular: 16px;"
-                  width="16"
-                />
                 <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="@octocat"
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
                 >
-                  @octocat
+                  <img
+                    alt="octocat"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="16"
+                    src="https://avatars.githubusercontent.com/u/583231?v=4"
+                    style="--avatarSize-regular: 16px;"
+                    width="16"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="@octocat"
+                  >
+                    @octocat
+                  </div>
                 </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
-              >
-                2
               </span>
               <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
               >
-                 (
-                2
-                )
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
               </span>
             </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_1d_-loading-announcement"
-            aria-label="My issues ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-issues"
-            data-variant="invisible"
-            title="My issues ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-issue-opened"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_1e_-loading-announcement"
-            aria-label="My pull requests ↗"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-pull-requests"
-            data-variant="invisible"
-            title="My pull requests ↗"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-git-pull-request"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_1f_-loading-announcement"
-            aria-label="Hide account notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="account-toggle"
-            data-variant="invisible"
-            title="Hide account notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
           </button>
-        </div>
-      </div>
-      <div>
-        Repository Notifications
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_1c_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="account-profile"
-        data-variant="invisible"
-        title="Open account profile"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_1n_-loading-announcement"
+              aria-label="My issues ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-issues"
+              data-variant="invisible"
+              title="My issues ↗"
+              type="button"
             >
-              <img
-                alt="octocat"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-issue-opened"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
                 height="16"
-                src="https://avatars.githubusercontent.com/u/583231?v=4"
-                style="--avatarSize-regular: 16px;"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
                 width="16"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="@octocat"
               >
-                @octocat
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                />
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_1o_-loading-announcement"
+              aria-label="My pull requests ↗"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-pull-requests"
+              data-variant="invisible"
+              title="My pull requests ↗"
+              type="button"
             >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-git-pull-request"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_1p_-loading-announcement"
+              aria-label="Hide account notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="account-toggle"
+              data-variant="invisible"
+              title="Hide account notifications"
+              type="button"
             >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-account-rest prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_1d_-loading-announcement"
-          aria-label="My issues ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-issues"
-          data-variant="invisible"
-          title="My issues ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-issue-opened"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_1e_-loading-announcement"
-          aria-label="My pull requests ↗"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-pull-requests"
-          data-variant="invisible"
-          title="My pull requests ↗"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-git-pull-request"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M1.5 3.25a2.25 2.25 0 1 1 3 2.122v5.256a2.251 2.251 0 1 1-1.5 0V5.372A2.25 2.25 0 0 1 1.5 3.25Zm5.677-.177L9.573.677A.25.25 0 0 1 10 .854V2.5h1A2.5 2.5 0 0 1 13.5 5v5.628a2.251 2.251 0 1 1-1.5 0V5a1 1 0 0 0-1-1h-1v1.646a.25.25 0 0 1-.427.177L7.177 3.427a.25.25 0 0 1 0-.354ZM3.75 2.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm0 9.5a.75.75 0 1 0 0 1.5.75.75 0 0 0 0-1.5Zm8.25.75a.75.75 0 1 0 1.5 0 .75.75 0 0 0-1.5 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_1f_-loading-announcement"
-          aria-label="Hide account notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="account-toggle"
-          data-variant="invisible"
-          title="Hide account notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div>
+          Repository Notifications
+        </div>
       </div>
     </div>
-    <div>
-      Repository Notifications
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
index ba7b41aa4..0fd0f5a3d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationFooter.test.tsx.snap
@@ -6,280 +6,302 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
   "baseElement": <body>
     <div>
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="wrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
-            data-wrap="nowrap"
-          >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-0ima0"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
+            data-wrap="wrap"
           >
+            <button
+              data-testid="view-profile"
+              title="gitify-app"
+              type="button"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+              </div>
+            </button>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="pr-1 prc-Text-Text-0ima0"
+                title="You're watching the repository."
               >
-                1
+                Updated
               </span>
+              <relative-time
+                datetime="2017-05-20T17:51:57.000Z"
+              >
+                May 20, 2017
+              </relative-time>
             </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
             <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="flex gap-1"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="octocat approved these changes"
               >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="gitify-app requested changes"
               >
-                1
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
             </div>
-          </span>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="wrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <button
-        data-testid="view-profile"
-        title="gitify-app"
-        type="button"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-testid="avatar"
-          data-wrap="nowrap"
-        >
-          <img
-            alt="gitify-app"
-            class="prc-Avatar-Avatar-ZRS-m"
-            data-component="Avatar"
-            height="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            style="--avatarSize-regular: 14px;"
-            width="14"
-          />
-        </div>
-      </button>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <span
-          class="pr-1 prc-Text-Text-0ima0"
-          title="You're watching the repository."
-        >
-          Updated
-        </span>
-        <relative-time
-          datetime="2017-05-20T17:51:57.000Z"
-        >
-          May 20, 2017
-        </relative-time>
-      </div>
-      <div
-        class="flex gap-1"
-      >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
+          data-wrap="wrap"
         >
+          <button
+            data-testid="view-profile"
+            title="gitify-app"
+            type="button"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-ZRS-m"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
+              />
+            </div>
+          </button>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
+            data-align="stretch"
             data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="pr-1 prc-Text-Text-0ima0"
+              title="You're watching the repository."
             >
-              1
+              Updated
             </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
             >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+            </span>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
             >
-              1
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </div>,
@@ -343,280 +365,302 @@ exports[`renderer/components/notifications/NotificationFooter.tsx security alert
   "baseElement": <body>
     <div>
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="wrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
-            data-wrap="nowrap"
-          >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-0ima0"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
+            data-wrap="wrap"
           >
+            <button
+              data-testid="view-profile"
+              title="gitify-app"
+              type="button"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+              </div>
+            </button>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="pr-1 prc-Text-Text-0ima0"
+                title="You're watching the repository."
               >
-                1
+                Updated
               </span>
+              <relative-time
+                datetime="2017-05-20T17:51:57.000Z"
+              >
+                May 20, 2017
+              </relative-time>
             </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
             <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="flex gap-1"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="octocat approved these changes"
               >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="gitify-app requested changes"
               >
-                1
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
             </div>
-          </span>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="wrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <button
-        data-testid="view-profile"
-        title="gitify-app"
-        type="button"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-testid="avatar"
-          data-wrap="nowrap"
-        >
-          <img
-            alt="gitify-app"
-            class="prc-Avatar-Avatar-ZRS-m"
-            data-component="Avatar"
-            height="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            style="--avatarSize-regular: 14px;"
-            width="14"
-          />
-        </div>
-      </button>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <span
-          class="pr-1 prc-Text-Text-0ima0"
-          title="You're watching the repository."
-        >
-          Updated
-        </span>
-        <relative-time
-          datetime="2017-05-20T17:51:57.000Z"
-        >
-          May 20, 2017
-        </relative-time>
-      </div>
-      <div
-        class="flex gap-1"
-      >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
+          data-wrap="wrap"
         >
+          <button
+            data-testid="view-profile"
+            title="gitify-app"
+            type="button"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-ZRS-m"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
+              />
+            </div>
+          </button>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
+            data-align="stretch"
             data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="pr-1 prc-Text-Text-0ima0"
+              title="You're watching the repository."
             >
-              1
+              Updated
             </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
             >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+            </span>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
             >
-              1
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </div>,
@@ -680,282 +724,304 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should default
   "baseElement": <body>
     <div>
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="wrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-testid="avatar"
-          data-wrap="nowrap"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-mark-github"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="14"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="14"
-          >
-            <path
-              d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-            />
-          </svg>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-0ima0"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
+          <div
+            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="wrap"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
-              data-gap="none"
+              data-gap="condensed"
               data-justify="start"
               data-padding="none"
+              data-testid="avatar"
               data-wrap="nowrap"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
+                class="octicon octicon-mark-github"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
-                height="12"
+                height="14"
                 overflow="visible"
                 style="vertical-align: text-bottom;"
                 viewBox="0 0 16 16"
-                width="12"
+                width="14"
               >
                 <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
                 />
               </svg>
-              <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
-              >
-                1
-              </span>
             </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
+              <span
+                class="pr-1 prc-Text-Text-0ima0"
+                title="You're watching the repository."
               >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
+                Updated
+              </span>
+              <relative-time
+                datetime="2017-05-20T17:51:57.000Z"
+              >
+                May 20, 2017
+              </relative-time>
+            </div>
+            <div
+              class="flex gap-1"
+            >
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="octocat approved these changes"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="gitify-app requested changes"
               >
-                1
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
             </div>
-          </span>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="wrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-testid="avatar"
-        data-wrap="nowrap"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="14"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="14"
-        >
-          <path
-            d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-          />
-        </svg>
-      </div>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <span
-          class="pr-1 prc-Text-Text-0ima0"
-          title="You're watching the repository."
-        >
-          Updated
-        </span>
-        <relative-time
-          datetime="2017-05-20T17:51:57.000Z"
-        >
-          May 20, 2017
-        </relative-time>
-      </div>
-      <div
-        class="flex gap-1"
-      >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
+        <div
+          class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="condensed"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="wrap"
         >
           <div
             class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
-            data-gap="none"
+            data-gap="condensed"
             data-justify="start"
             data-padding="none"
+            data-testid="avatar"
             data-wrap="nowrap"
           >
             <svg
               aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
+              class="octicon octicon-mark-github"
               display="inline-block"
               fill="currentColor"
               focusable="false"
-              height="12"
+              height="14"
               overflow="visible"
               style="vertical-align: text-bottom;"
               viewBox="0 0 16 16"
-              width="12"
+              width="14"
             >
               <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
               />
             </svg>
-            <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
-            >
-              1
-            </span>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
+            data-align="stretch"
             data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
+            <span
+              class="pr-1 prc-Text-Text-0ima0"
+              title="You're watching the repository."
             >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
+              Updated
+            </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
+          </div>
+          <div
+            class="flex gap-1"
+          >
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
             >
-              1
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+            </span>
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </div>,
@@ -1019,280 +1085,302 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
   "baseElement": <body>
     <div>
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="wrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
-            data-wrap="nowrap"
-          >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-0ima0"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
+            data-wrap="wrap"
           >
+            <button
+              data-testid="view-profile"
+              title="gitify-app"
+              type="button"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+              </div>
+            </button>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="pr-1 prc-Text-Text-0ima0"
+                title="You're watching the repository."
               >
-                1
+                Updated
               </span>
+              <relative-time
+                datetime="2017-05-20T17:51:57.000Z"
+              >
+                May 20, 2017
+              </relative-time>
             </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
             <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="flex gap-1"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="octocat approved these changes"
               >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="gitify-app requested changes"
               >
-                1
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
             </div>
-          </span>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="wrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <button
-        data-testid="view-profile"
-        title="gitify-app"
-        type="button"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-testid="avatar"
-          data-wrap="nowrap"
-        >
-          <img
-            alt="gitify-app"
-            class="prc-Avatar-Avatar-ZRS-m"
-            data-component="Avatar"
-            height="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            style="--avatarSize-regular: 14px;"
-            width="14"
-          />
-        </div>
-      </button>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <span
-          class="pr-1 prc-Text-Text-0ima0"
-          title="You're watching the repository."
-        >
-          Updated
-        </span>
-        <relative-time
-          datetime="2017-05-20T17:51:57.000Z"
-        >
-          May 20, 2017
-        </relative-time>
-      </div>
-      <div
-        class="flex gap-1"
-      >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
+          data-wrap="wrap"
         >
+          <button
+            data-testid="view-profile"
+            title="gitify-app"
+            type="button"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-ZRS-m"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
+              />
+            </div>
+          </button>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
+            data-align="stretch"
             data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="pr-1 prc-Text-Text-0ima0"
+              title="You're watching the repository."
             >
-              1
+              Updated
             </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
             >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+            </span>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
             >
-              1
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </div>,
@@ -1356,280 +1444,302 @@ exports[`renderer/components/notifications/NotificationFooter.tsx should render
   "baseElement": <body>
     <div>
       <div
-        class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="wrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          data-testid="view-profile"
-          title="gitify-app"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
-            data-wrap="nowrap"
-          >
-            <img
-              alt="gitify-app"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-          </div>
-        </button>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <span
-            class="pr-1 prc-Text-Text-0ima0"
-            title="You're watching the repository."
-          >
-            Updated
-          </span>
-          <relative-time
-            datetime="2017-05-20T17:51:57.000Z"
-          >
-            May 20, 2017
-          </relative-time>
-        </div>
-        <div
-          class="flex gap-1"
-        >
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="octocat approved these changes"
+            data-wrap="wrap"
           >
+            <button
+              data-testid="view-profile"
+              title="gitify-app"
+              type="button"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+              </div>
+            </button>
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-check text-gitify-icon-open"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
-              >
-                <path
-                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                />
-              </svg>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="pr-1 prc-Text-Text-0ima0"
+                title="You're watching the repository."
               >
-                1
+                Updated
               </span>
+              <relative-time
+                datetime="2017-05-20T17:51:57.000Z"
+              >
+                May 20, 2017
+              </relative-time>
             </div>
-          </span>
-          <span
-            class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-            data-size="small"
-            data-variant="secondary"
-            title="gitify-app requested changes"
-          >
             <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="none"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="flex gap-1"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-file-diff text-gitify-icon-closed"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="12"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="12"
+              <span
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="octocat approved these changes"
               >
-                <path
-                  d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                />
-              </svg>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-check text-gitify-icon-open"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
+              </span>
               <span
-                class="text-xxs px-1 prc-Text-Text-0ima0"
+                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                data-size="small"
+                data-variant="secondary"
+                title="gitify-app requested changes"
               >
-                1
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="none"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-file-diff text-gitify-icon-closed"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="12"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="12"
+                  >
+                    <path
+                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                    />
+                  </svg>
+                  <span
+                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                  >
+                    1
+                  </span>
+                </div>
               </span>
             </div>
-          </span>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="condensed"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="wrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <button
-        data-testid="view-profile"
-        title="gitify-app"
-        type="button"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="horizontal"
           data-gap="condensed"
           data-justify="start"
           data-padding="none"
-          data-testid="avatar"
-          data-wrap="nowrap"
-        >
-          <img
-            alt="gitify-app"
-            class="prc-Avatar-Avatar-ZRS-m"
-            data-component="Avatar"
-            height="14"
-            src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-            style="--avatarSize-regular: 14px;"
-            width="14"
-          />
-        </div>
-      </button>
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <span
-          class="pr-1 prc-Text-Text-0ima0"
-          title="You're watching the repository."
-        >
-          Updated
-        </span>
-        <relative-time
-          datetime="2017-05-20T17:51:57.000Z"
-        >
-          May 20, 2017
-        </relative-time>
-      </div>
-      <div
-        class="flex gap-1"
-      >
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="octocat approved these changes"
+          data-wrap="wrap"
         >
+          <button
+            data-testid="view-profile"
+            title="gitify-app"
+            type="button"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-testid="avatar"
+              data-wrap="nowrap"
+            >
+              <img
+                alt="gitify-app"
+                class="prc-Avatar-Avatar-ZRS-m"
+                data-component="Avatar"
+                height="14"
+                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                style="--avatarSize-regular: 14px;"
+                width="14"
+              />
+            </div>
+          </button>
           <div
             class="prc-Stack-Stack-WJVsK"
-            data-align="center"
+            data-align="stretch"
             data-direction="horizontal"
             data-gap="none"
             data-justify="start"
             data-padding="none"
             data-wrap="nowrap"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="pr-1 prc-Text-Text-0ima0"
+              title="You're watching the repository."
             >
-              1
+              Updated
             </span>
+            <relative-time
+              datetime="2017-05-20T17:51:57.000Z"
+            >
+              May 20, 2017
+            </relative-time>
           </div>
-        </span>
-        <span
-          class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-          data-size="small"
-          data-variant="secondary"
-          title="gitify-app requested changes"
-        >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex gap-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-file-diff text-gitify-icon-closed"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="12"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="12"
+            <span
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="octocat approved these changes"
             >
-              <path
-                d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-              />
-            </svg>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
+            </span>
             <span
-              class="text-xxs px-1 prc-Text-Text-0ima0"
+              class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+              data-size="small"
+              data-variant="secondary"
+              title="gitify-app requested changes"
             >
-              1
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-file-diff text-gitify-icon-closed"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="12"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="12"
+                >
+                  <path
+                    d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                  />
+                </svg>
+                <span
+                  class="text-xxs px-1 prc-Text-Text-0ima0"
+                >
+                  1
+                </span>
+              </div>
             </span>
           </div>
-        </span>
+        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
index b8f897c1f..8a531806d 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationHeader.test.tsx.snap
@@ -6,22 +6,16 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
   "baseElement": <body>
     <div>
       <div
-        class="py-0.5"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            class="text-xs font-medium"
-            data-testid="view-repository"
-            title="Open repository ↗"
-            type="button"
+          <div
+            class="py-0.5"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
@@ -30,53 +24,64 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-testid="avatar"
               data-wrap="nowrap"
             >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 14px;"
-                width="14"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
+              <button
+                class="text-xs font-medium"
+                data-testid="view-repository"
+                title="Open repository ↗"
+                type="button"
               >
-                gitify-app/notifications-test
-              </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="14"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    style="--avatarSize-regular: 14px;"
+                    width="14"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </button>
+              <div
+                class="text-xxs opacity-50"
+              />
             </div>
-          </button>
-          <div
-            class="text-xxs opacity-50"
-          />
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="py-0.5"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          class="text-xs font-medium"
-          data-testid="view-repository"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="py-0.5"
         >
           <div
             class="prc-Stack-Stack-WJVsK"
@@ -85,31 +90,48 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
             data-wrap="nowrap"
           >
-            <img
-              alt="gitify-app/notifications-test"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-            <div
-              class="prc-Truncate-Truncate-A9Wn6"
-              data-inline="true"
-              style="--truncate-max-width: 280px;"
-              title="gitify-app/notifications-test"
+            <button
+              class="text-xs font-medium"
+              data-testid="view-repository"
+              title="Open repository ↗"
+              type="button"
             >
-              gitify-app/notifications-test
-            </div>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+                <div
+                  class="prc-Truncate-Truncate-A9Wn6"
+                  data-inline="true"
+                  style="--truncate-max-width: 280px;"
+                  title="gitify-app/notifications-test"
+                >
+                  gitify-app/notifications-test
+                </div>
+              </div>
+            </button>
+            <div
+              class="text-xxs opacity-50"
+            />
           </div>
-        </button>
-        <div
-          class="text-xxs opacity-50"
-        />
+        </div>
       </div>
     </div>
   </div>,
@@ -173,22 +195,16 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
   "baseElement": <body>
     <div>
       <div
-        class="py-0.5"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            class="text-xs font-medium"
-            data-testid="view-repository"
-            title="Open repository ↗"
-            type="button"
+          <div
+            class="py-0.5"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
@@ -197,53 +213,64 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-testid="avatar"
               data-wrap="nowrap"
             >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 14px;"
-                width="14"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
+              <button
+                class="text-xs font-medium"
+                data-testid="view-repository"
+                title="Open repository ↗"
+                type="button"
               >
-                gitify-app/notifications-test
-              </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="14"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    style="--avatarSize-regular: 14px;"
+                    width="14"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </button>
+              <div
+                class="text-xxs opacity-50 hidden"
+              />
             </div>
-          </button>
-          <div
-            class="text-xxs opacity-50 hidden"
-          />
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="py-0.5"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          class="text-xs font-medium"
-          data-testid="view-repository"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="py-0.5"
         >
           <div
             class="prc-Stack-Stack-WJVsK"
@@ -252,31 +279,48 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
             data-wrap="nowrap"
           >
-            <img
-              alt="gitify-app/notifications-test"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-            <div
-              class="prc-Truncate-Truncate-A9Wn6"
-              data-inline="true"
-              style="--truncate-max-width: 280px;"
-              title="gitify-app/notifications-test"
+            <button
+              class="text-xs font-medium"
+              data-testid="view-repository"
+              title="Open repository ↗"
+              type="button"
             >
-              gitify-app/notifications-test
-            </div>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+                <div
+                  class="prc-Truncate-Truncate-A9Wn6"
+                  data-inline="true"
+                  style="--truncate-max-width: 280px;"
+                  title="gitify-app/notifications-test"
+                >
+                  gitify-app/notifications-test
+                </div>
+              </div>
+            </button>
+            <div
+              class="text-xxs opacity-50 hidden"
+            />
           </div>
-        </button>
-        <div
-          class="text-xxs opacity-50 hidden"
-        />
+        </div>
       </div>
     </div>
   </div>,
@@ -340,22 +384,16 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
   "baseElement": <body>
     <div>
       <div
-        class="py-0.5"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            class="text-xs font-medium"
-            data-testid="view-repository"
-            title="Open repository ↗"
-            type="button"
+          <div
+            class="py-0.5"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
@@ -364,53 +402,64 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-testid="avatar"
               data-wrap="nowrap"
             >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="14"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 14px;"
-                width="14"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
+              <button
+                class="text-xs font-medium"
+                data-testid="view-repository"
+                title="Open repository ↗"
+                type="button"
               >
-                gitify-app/notifications-test
-              </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="14"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    style="--avatarSize-regular: 14px;"
+                    width="14"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </button>
+              <div
+                class="text-xxs opacity-50"
+              />
             </div>
-          </button>
-          <div
-            class="text-xxs opacity-50"
-          />
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="py-0.5"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          class="text-xs font-medium"
-          data-testid="view-repository"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="py-0.5"
         >
           <div
             class="prc-Stack-Stack-WJVsK"
@@ -419,31 +468,48 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-testid="avatar"
             data-wrap="nowrap"
           >
-            <img
-              alt="gitify-app/notifications-test"
-              class="prc-Avatar-Avatar-ZRS-m"
-              data-component="Avatar"
-              height="14"
-              src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-              style="--avatarSize-regular: 14px;"
-              width="14"
-            />
-            <div
-              class="prc-Truncate-Truncate-A9Wn6"
-              data-inline="true"
-              style="--truncate-max-width: 280px;"
-              title="gitify-app/notifications-test"
+            <button
+              class="text-xs font-medium"
+              data-testid="view-repository"
+              title="Open repository ↗"
+              type="button"
             >
-              gitify-app/notifications-test
-            </div>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-testid="avatar"
+                data-wrap="nowrap"
+              >
+                <img
+                  alt="gitify-app/notifications-test"
+                  class="prc-Avatar-Avatar-ZRS-m"
+                  data-component="Avatar"
+                  height="14"
+                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                  style="--avatarSize-regular: 14px;"
+                  width="14"
+                />
+                <div
+                  class="prc-Truncate-Truncate-A9Wn6"
+                  data-inline="true"
+                  style="--truncate-max-width: 280px;"
+                  title="gitify-app/notifications-test"
+                >
+                  gitify-app/notifications-test
+                </div>
+              </div>
+            </button>
+            <div
+              class="text-xxs opacity-50"
+            />
           </div>
-        </button>
-        <div
-          class="text-xxs opacity-50"
-        />
+        </div>
       </div>
     </div>
   </div>,
@@ -505,9 +571,31 @@ exports[`renderer/components/notifications/NotificationHeader.tsx should render
 {
   "asFragment": [Function],
   "baseElement": <body>
-    <div />
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        />
+      </div>
+    </div>
   </body>,
-  "container": <div />,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      />
+    </div>
+  </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
   "findAllByDisplayValue": [Function],
diff --git a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
index abcb9ff5c..331b81ab3 100644
--- a/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/NotificationRow.test.tsx.snap
@@ -6,79 +6,73 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
   "baseElement": <body>
     <div>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            aria-describedby="_r_0_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_0_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+            id="138661096"
           >
             <div
-              class="py-0.5"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
+              <button
+                aria-describedby="_r_1_"
+                type="button"
+              >
+                <svg
+                  aria-label="Open Issue"
+                  class="octicon octicon-issue-opened text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="18"
+                  overflow="visible"
+                  role="img"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="18"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_1_"
+                popover="auto"
+                role="tooltip"
+              >
+                Open Issue
+              </span>
               <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
+                class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <button
-                  class="text-xs font-medium"
-                  data-testid="view-repository"
-                  title="Open repository ↗"
-                  type="button"
+                <div
+                  class="py-0.5"
                 >
                   <div
                     class="prc-Stack-Stack-WJVsK"
@@ -87,663 +81,691 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
                     data-gap="condensed"
                     data-justify="start"
                     data-padding="none"
-                    data-testid="avatar"
                     data-wrap="nowrap"
                   >
-                    <img
-                      alt="gitify-app/notifications-test"
-                      class="prc-Avatar-Avatar-ZRS-m"
-                      data-component="Avatar"
-                      height="14"
-                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                      style="--avatarSize-regular: 14px;"
-                      width="14"
-                    />
-                    <div
-                      class="prc-Truncate-Truncate-A9Wn6"
-                      data-inline="true"
-                      style="--truncate-max-width: 280px;"
-                      title="gitify-app/notifications-test"
+                    <button
+                      class="text-xs font-medium"
+                      data-testid="view-repository"
+                      title="Open repository ↗"
+                      type="button"
                     >
-                      gitify-app/notifications-test
-                    </div>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="condensed"
+                        data-justify="start"
+                        data-padding="none"
+                        data-testid="avatar"
+                        data-wrap="nowrap"
+                      >
+                        <img
+                          alt="gitify-app/notifications-test"
+                          class="prc-Avatar-Avatar-ZRS-m"
+                          data-component="Avatar"
+                          height="14"
+                          src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                          style="--avatarSize-regular: 14px;"
+                          width="14"
+                        />
+                        <div
+                          class="prc-Truncate-Truncate-A9Wn6"
+                          data-inline="true"
+                          style="--truncate-max-width: 280px;"
+                          title="gitify-app/notifications-test"
+                        >
+                          gitify-app/notifications-test
+                        </div>
+                      </div>
+                    </button>
+                    <div
+                      class="text-xxs opacity-50"
+                    />
                   </div>
-                </button>
-                <div
-                  class="text-xxs opacity-50"
-                />
-              </div>
-            </div>
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test!"
-            >
-              <span
-                class="truncate prc-Text-Text-0ima0"
-              >
-                I am a robot and this is a test!
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-              />
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="wrap"
-            >
-              <button
-                data-testid="view-profile"
-                title="gitify-app"
-                type="button"
-              >
+                </div>
                 <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
+                  class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                  data-align="start"
                   data-direction="horizontal"
                   data-gap="condensed"
-                  data-justify="start"
+                  data-justify="space-between"
                   data-padding="none"
-                  data-testid="avatar"
+                  data-testid="notification-row"
                   data-wrap="nowrap"
+                  title="I am a robot and this is a test!"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
+                  <span
+                    class="truncate prc-Text-Text-0ima0"
+                  >
+                    I am a robot and this is a test!
+                  </span>
+                  <span
+                    class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
                   />
                 </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-0ima0"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="octocat approved these changes"
+                <div
+                  class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="wrap"
                 >
+                  <button
+                    data-testid="view-profile"
+                    title="gitify-app"
+                    type="button"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                    </div>
+                  </button>
                   <div
                     class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
+                    data-align="stretch"
                     data-direction="horizontal"
                     data-gap="none"
                     data-justify="start"
                     data-padding="none"
                     data-wrap="nowrap"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-check text-gitify-icon-open"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
-                    >
-                      <path
-                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                      />
-                    </svg>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="pr-1 prc-Text-Text-0ima0"
+                      title="You're watching the repository."
                     >
-                      1
+                      Updated
                     </span>
+                    <relative-time
+                      datetime="2017-05-20T17:51:57.000Z"
+                    >
+                      May 20, 2017
+                    </relative-time>
                   </div>
-                </span>
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="gitify-app requested changes"
-                >
                   <div
-                    class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="none"
-                    data-justify="start"
-                    data-padding="none"
-                    data-wrap="nowrap"
+                    class="flex gap-1"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-file-diff text-gitify-icon-closed"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="octocat approved these changes"
                     >
-                      <path
-                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                      />
-                    </svg>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="gitify-app requested changes"
                     >
-                      1
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
                     </span>
                   </div>
-                </span>
+                </div>
               </div>
             </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_1_-loading-announcement"
-            aria-label="Mark as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-done"
-            data-variant="invisible"
-            title="Mark as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_2_-loading-announcement"
-            aria-label="Mark as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-read"
-            data-variant="invisible"
-            title="Mark as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_3_-loading-announcement"
-            aria-label="Unsubscribe from thread"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-      id="138661096"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_0_"
-          type="button"
-        >
-          <svg
-            aria-label="Open Issue"
-            class="octicon octicon-issue-opened text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="18"
-            overflow="visible"
-            role="img"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="18"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_0_"
-          popover="auto"
-          role="tooltip"
-        >
-          Open Issue
-        </span>
-        <div
-          class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="py-0.5"
-          >
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
-              data-gap="condensed"
+              data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
               <button
-                class="text-xs font-medium"
-                data-testid="view-repository"
-                title="Open repository ↗"
+                aria-describedby="_r_2_-loading-announcement"
+                aria-label="Mark as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-done"
+                data-variant="invisible"
+                title="Mark as done"
                 type="button"
               >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <img
-                    alt="gitify-app/notifications-test"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="gitify-app/notifications-test"
-                  >
-                    gitify-app/notifications-test
-                  </div>
-                </div>
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_3_-loading-announcement"
+                aria-label="Mark as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-read"
+                data-variant="invisible"
+                title="Mark as read"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_4_-loading-announcement"
+                aria-label="Unsubscribe from thread"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-unsubscribe-from-thread"
+                data-variant="invisible"
+                title="Unsubscribe from thread"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell-slash"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  />
+                </svg>
               </button>
-              <div
-                class="text-xxs opacity-50"
-              />
             </div>
           </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+          id="138661096"
+        >
           <div
-            class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-            data-align="start"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="space-between"
-            data-padding="none"
-            data-testid="notification-row"
-            data-wrap="nowrap"
-            title="I am a robot and this is a test!"
-          >
-            <span
-              class="truncate prc-Text-Text-0ima0"
-            >
-              I am a robot and this is a test!
-            </span>
-            <span
-              class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-            />
-          </div>
-          <div
-            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-wrap="wrap"
+            data-wrap="nowrap"
           >
             <button
-              data-testid="view-profile"
-              title="gitify-app"
+              aria-describedby="_r_1_"
               type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <svg
+                aria-label="Open Issue"
+                class="octicon octicon-issue-opened text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="18"
+                overflow="visible"
+                role="img"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="18"
               >
-                <img
-                  alt="gitify-app"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 14px;"
-                  width="14"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-              </div>
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
             </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_1_"
+              popover="auto"
+              role="tooltip"
+            >
+              Open Issue
+            </span>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
               data-align="stretch"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="pr-1 prc-Text-Text-0ima0"
-                title="You're watching the repository."
-              >
-                Updated
-              </span>
-              <relative-time
-                datetime="2017-05-20T17:51:57.000Z"
-              >
-                May 20, 2017
-              </relative-time>
-            </div>
-            <div
-              class="flex gap-1"
-            >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+              <div
+                class="py-0.5"
               >
                 <div
                   class="prc-Stack-Stack-WJVsK"
                   data-align="center"
                   data-direction="horizontal"
-                  data-gap="none"
+                  data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <button
+                    class="text-xs font-medium"
+                    data-testid="view-repository"
+                    title="Open repository ↗"
+                    type="button"
                   >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
-                  <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
-                  >
-                    1
-                  </span>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app/notifications-test"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                      <div
+                        class="prc-Truncate-Truncate-A9Wn6"
+                        data-inline="true"
+                        style="--truncate-max-width: 280px;"
+                        title="gitify-app/notifications-test"
+                      >
+                        gitify-app/notifications-test
+                      </div>
+                    </div>
+                  </button>
+                  <div
+                    class="text-xxs opacity-50"
+                  />
                 </div>
-              </span>
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
+              </div>
+              <div
+                class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                data-align="start"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="space-between"
+                data-padding="none"
+                data-testid="notification-row"
+                data-wrap="nowrap"
+                title="I am a robot and this is a test!"
               >
+                <span
+                  class="truncate prc-Text-Text-0ima0"
+                >
+                  I am a robot and this is a test!
+                </span>
+                <span
+                  class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                />
+              </div>
+              <div
+                class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="wrap"
+              >
+                <button
+                  data-testid="view-profile"
+                  title="gitify-app"
+                  type="button"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="14"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 14px;"
+                      width="14"
+                    />
+                  </div>
+                </button>
                 <div
                   class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
+                  data-align="stretch"
                   data-direction="horizontal"
                   data-gap="none"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <span
+                    class="pr-1 prc-Text-Text-0ima0"
+                    title="You're watching the repository."
                   >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
+                    Updated
+                  </span>
+                  <relative-time
+                    datetime="2017-05-20T17:51:57.000Z"
+                  >
+                    May 20, 2017
+                  </relative-time>
+                </div>
+                <div
+                  class="flex gap-1"
+                >
+                  <span
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="octocat approved these changes"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-check text-gitify-icon-open"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
+                  </span>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="gitify-app requested changes"
                   >
-                    1
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-file-diff text-gitify-icon-closed"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
                   </span>
                 </div>
-              </span>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_1_-loading-announcement"
-          aria-label="Mark as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-done"
-          data-variant="invisible"
-          title="Mark as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_2_-loading-announcement"
-          aria-label="Mark as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-read"
-          data-variant="invisible"
-          title="Mark as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_3_-loading-announcement"
-          aria-label="Unsubscribe from thread"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-unsubscribe-from-thread"
-          data-variant="invisible"
-          title="Unsubscribe from thread"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell-slash"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <path
-              d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-            />
-          </svg>
-        </button>
+            <button
+              aria-describedby="_r_2_-loading-announcement"
+              aria-label="Mark as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-done"
+              data-variant="invisible"
+              title="Mark as done"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_3_-loading-announcement"
+              aria-label="Mark as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-read"
+              data-variant="invisible"
+              title="Mark as read"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_4_-loading-announcement"
+              aria-label="Unsubscribe from thread"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-unsubscribe-from-thread"
+              data-variant="invisible"
+              title="Unsubscribe from thread"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell-slash"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -807,640 +829,662 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
   "baseElement": <body>
     <div>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            aria-describedby="_r_4_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_4_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+            id="138661096"
           >
             <div
-              class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test!"
-            >
-              <span
-                class="truncate prc-Text-Text-0ima0"
-              >
-                I am a robot and this is a test!
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
-              />
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-wrap="wrap"
+              data-wrap="nowrap"
             >
               <button
-                data-testid="view-profile"
-                title="gitify-app"
+                aria-describedby="_r_6_"
                 type="button"
               >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
+                <svg
+                  aria-label="Open Issue"
+                  class="octicon octicon-issue-opened text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="18"
+                  overflow="visible"
+                  role="img"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="18"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
-                </div>
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
               </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_6_"
+                popover="auto"
+                role="tooltip"
+              >
+                Open Issue
+              </span>
               <div
-                class="prc-Stack-Stack-WJVsK"
+                class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
                 data-align="stretch"
-                data-direction="horizontal"
+                data-direction="vertical"
                 data-gap="none"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="pr-1 prc-Text-Text-0ima0"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
+                <div
+                  class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                  data-align="start"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="space-between"
+                  data-padding="none"
+                  data-testid="notification-row"
+                  data-wrap="nowrap"
+                  title="I am a robot and this is a test!"
                 >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="octocat approved these changes"
+                  <span
+                    class="truncate prc-Text-Text-0ima0"
+                  >
+                    I am a robot and this is a test!
+                  </span>
+                  <span
+                    class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
+                  />
+                </div>
+                <div
+                  class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="wrap"
                 >
+                  <button
+                    data-testid="view-profile"
+                    title="gitify-app"
+                    type="button"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                    </div>
+                  </button>
                   <div
                     class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
+                    data-align="stretch"
                     data-direction="horizontal"
                     data-gap="none"
                     data-justify="start"
                     data-padding="none"
                     data-wrap="nowrap"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-check text-gitify-icon-open"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
-                    >
-                      <path
-                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                      />
-                    </svg>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="pr-1 prc-Text-Text-0ima0"
+                      title="You're watching the repository."
                     >
-                      1
+                      Updated
                     </span>
+                    <relative-time
+                      datetime="2017-05-20T17:51:57.000Z"
+                    >
+                      May 20, 2017
+                    </relative-time>
                   </div>
-                </span>
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="gitify-app requested changes"
-                >
                   <div
-                    class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="none"
-                    data-justify="start"
-                    data-padding="none"
-                    data-wrap="nowrap"
+                    class="flex gap-1"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-file-diff text-gitify-icon-closed"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="octocat approved these changes"
                     >
-                      <path
-                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                      />
-                    </svg>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="gitify-app requested changes"
                     >
-                      1
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
                     </span>
                   </div>
-                </span>
+                </div>
               </div>
             </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_5_-loading-announcement"
-            aria-label="Mark as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-done"
-            data-variant="invisible"
-            title="Mark as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_6_-loading-announcement"
-            aria-label="Mark as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-read"
-            data-variant="invisible"
-            title="Mark as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_7_-loading-announcement"
-            aria-label="Unsubscribe from thread"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-              />
-            </svg>
-          </button>
+              <button
+                aria-describedby="_r_7_-loading-announcement"
+                aria-label="Mark as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-done"
+                data-variant="invisible"
+                title="Mark as done"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_8_-loading-announcement"
+                aria-label="Mark as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-read"
+                data-variant="invisible"
+                title="Mark as read"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_9_-loading-announcement"
+                aria-label="Unsubscribe from thread"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-unsubscribe-from-thread"
+                data-variant="invisible"
+                title="Unsubscribe from thread"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell-slash"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-      id="138661096"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_4_"
-          type="button"
-        >
-          <svg
-            aria-label="Open Issue"
-            class="octicon octicon-issue-opened text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="18"
-            overflow="visible"
-            role="img"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="18"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_4_"
-          popover="auto"
-          role="tooltip"
-        >
-          Open Issue
-        </span>
         <div
-          class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+          id="138661096"
         >
           <div
-            class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-            data-align="start"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="space-between"
-            data-padding="none"
-            data-testid="notification-row"
-            data-wrap="nowrap"
-            title="I am a robot and this is a test!"
-          >
-            <span
-              class="truncate prc-Text-Text-0ima0"
-            >
-              I am a robot and this is a test!
-            </span>
-            <span
-              class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
-            />
-          </div>
-          <div
-            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-wrap="wrap"
+            data-wrap="nowrap"
           >
             <button
-              data-testid="view-profile"
-              title="gitify-app"
+              aria-describedby="_r_6_"
               type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <svg
+                aria-label="Open Issue"
+                class="octicon octicon-issue-opened text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="18"
+                overflow="visible"
+                role="img"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="18"
               >
-                <img
-                  alt="gitify-app"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 14px;"
-                  width="14"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-              </div>
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
             </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_6_"
+              popover="auto"
+              role="tooltip"
+            >
+              Open Issue
+            </span>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
               data-align="stretch"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="pr-1 prc-Text-Text-0ima0"
-                title="You're watching the repository."
-              >
-                Updated
-              </span>
-              <relative-time
-                datetime="2017-05-20T17:51:57.000Z"
+              <div
+                class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                data-align="start"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="space-between"
+                data-padding="none"
+                data-testid="notification-row"
+                data-wrap="nowrap"
+                title="I am a robot and this is a test!"
               >
-                May 20, 2017
-              </relative-time>
-            </div>
-            <div
-              class="flex gap-1"
-            >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+                <span
+                  class="truncate prc-Text-Text-0ima0"
+                >
+                  I am a robot and this is a test!
+                </span>
+                <span
+                  class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
+                />
+              </div>
+              <div
+                class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="wrap"
               >
+                <button
+                  data-testid="view-profile"
+                  title="gitify-app"
+                  type="button"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="14"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 14px;"
+                      width="14"
+                    />
+                  </div>
+                </button>
                 <div
                   class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
+                  data-align="stretch"
                   data-direction="horizontal"
                   data-gap="none"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="pr-1 prc-Text-Text-0ima0"
+                    title="You're watching the repository."
                   >
-                    1
+                    Updated
                   </span>
+                  <relative-time
+                    datetime="2017-05-20T17:51:57.000Z"
+                  >
+                    May 20, 2017
+                  </relative-time>
                 </div>
-              </span>
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
-              >
                 <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                  class="flex gap-1"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <span
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="octocat approved these changes"
                   >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-check text-gitify-icon-open"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
+                  </span>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="gitify-app requested changes"
                   >
-                    1
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-file-diff text-gitify-icon-closed"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
                   </span>
                 </div>
-              </span>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_5_-loading-announcement"
-          aria-label="Mark as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-done"
-          data-variant="invisible"
-          title="Mark as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_6_-loading-announcement"
-          aria-label="Mark as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-read"
-          data-variant="invisible"
-          title="Mark as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_7_-loading-announcement"
-          aria-label="Unsubscribe from thread"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-unsubscribe-from-thread"
-          data-variant="invisible"
-          title="Unsubscribe from thread"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell-slash"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <path
-              d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-            />
-          </svg>
-        </button>
+            <button
+              aria-describedby="_r_7_-loading-announcement"
+              aria-label="Mark as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-done"
+              data-variant="invisible"
+              title="Mark as done"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_8_-loading-announcement"
+              aria-label="Mark as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-read"
+              data-variant="invisible"
+              title="Mark as read"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_9_-loading-announcement"
+              aria-label="Unsubscribe from thread"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-unsubscribe-from-thread"
+              data-variant="invisible"
+              title="Unsubscribe from thread"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell-slash"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -1504,640 +1548,662 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
   "baseElement": <body>
     <div>
       <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-        id="138661096"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            aria-describedby="_r_8_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_8_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
           <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+            id="138661096"
           >
             <div
-              class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test!"
-            >
-              <span
-                class="truncate prc-Text-Text-0ima0"
-              >
-                I am a robot and this is a test!
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-              />
-            </div>
-            <div
-              class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-wrap="wrap"
+              data-wrap="nowrap"
             >
               <button
-                data-testid="view-profile"
-                title="gitify-app"
+                aria-describedby="_r_b_"
                 type="button"
               >
+                <svg
+                  aria-label="Open Issue"
+                  class="octicon octicon-issue-opened text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="18"
+                  overflow="visible"
+                  role="img"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="18"
+                >
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
+                  />
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
+              </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_b_"
+                popover="auto"
+                role="tooltip"
+              >
+                Open Issue
+              </span>
+              <div
+                class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
+              >
+                <div
+                  class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                  data-align="start"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="space-between"
+                  data-padding="none"
+                  data-testid="notification-row"
+                  data-wrap="nowrap"
+                  title="I am a robot and this is a test!"
+                >
+                  <span
+                    class="truncate prc-Text-Text-0ima0"
+                  >
+                    I am a robot and this is a test!
+                  </span>
+                  <span
+                    class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                  />
+                </div>
                 <div
-                  class="prc-Stack-Stack-WJVsK"
+                  class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
                   data-align="center"
                   data-direction="horizontal"
                   data-gap="condensed"
                   data-justify="start"
                   data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
-                  />
-                </div>
-              </button>
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="stretch"
-                data-direction="horizontal"
-                data-gap="none"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <span
-                  class="pr-1 prc-Text-Text-0ima0"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
-                >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="octocat approved these changes"
+                  data-wrap="wrap"
                 >
+                  <button
+                    data-testid="view-profile"
+                    title="gitify-app"
+                    type="button"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                    </div>
+                  </button>
                   <div
                     class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
+                    data-align="stretch"
                     data-direction="horizontal"
                     data-gap="none"
                     data-justify="start"
                     data-padding="none"
                     data-wrap="nowrap"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-check text-gitify-icon-open"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
-                    >
-                      <path
-                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                      />
-                    </svg>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="pr-1 prc-Text-Text-0ima0"
+                      title="You're watching the repository."
                     >
-                      1
+                      Updated
                     </span>
+                    <relative-time
+                      datetime="2017-05-20T17:51:57.000Z"
+                    >
+                      May 20, 2017
+                    </relative-time>
                   </div>
-                </span>
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="gitify-app requested changes"
-                >
                   <div
-                    class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="none"
-                    data-justify="start"
-                    data-padding="none"
-                    data-wrap="nowrap"
+                    class="flex gap-1"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-file-diff text-gitify-icon-closed"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="octocat approved these changes"
                     >
-                      <path
-                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                      />
-                    </svg>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="gitify-app requested changes"
                     >
-                      1
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
                     </span>
                   </div>
-                </span>
+                </div>
               </div>
             </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_9_-loading-announcement"
-            aria-label="Mark as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-done"
-            data-variant="invisible"
-            title="Mark as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_a_-loading-announcement"
-            aria-label="Mark as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-read"
-            data-variant="invisible"
-            title="Mark as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_b_-loading-announcement"
-            aria-label="Unsubscribe from thread"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-              />
-            </svg>
-          </button>
+              <button
+                aria-describedby="_r_c_-loading-announcement"
+                aria-label="Mark as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-done"
+                data-variant="invisible"
+                title="Mark as done"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_d_-loading-announcement"
+                aria-label="Mark as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-read"
+                data-variant="invisible"
+                title="Mark as read"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_e_-loading-announcement"
+                aria-label="Unsubscribe from thread"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-unsubscribe-from-thread"
+                data-variant="invisible"
+                title="Unsubscribe from thread"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell-slash"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
-      id="138661096"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_8_"
-          type="button"
-        >
-          <svg
-            aria-label="Open Issue"
-            class="octicon octicon-issue-opened text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="18"
-            overflow="visible"
-            role="img"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="18"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_8_"
-          popover="auto"
-          role="tooltip"
-        >
-          Open Issue
-        </span>
         <div
-          class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover"
+          id="138661096"
         >
           <div
-            class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-            data-align="start"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="space-between"
-            data-padding="none"
-            data-testid="notification-row"
-            data-wrap="nowrap"
-            title="I am a robot and this is a test!"
-          >
-            <span
-              class="truncate prc-Text-Text-0ima0"
-            >
-              I am a robot and this is a test!
-            </span>
-            <span
-              class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
-            />
-          </div>
-          <div
-            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-wrap="wrap"
+            data-wrap="nowrap"
           >
             <button
-              data-testid="view-profile"
-              title="gitify-app"
+              aria-describedby="_r_b_"
               type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <svg
+                aria-label="Open Issue"
+                class="octicon octicon-issue-opened text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="18"
+                overflow="visible"
+                role="img"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="18"
               >
-                <img
-                  alt="gitify-app"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 14px;"
-                  width="14"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-              </div>
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
             </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_b_"
+              popover="auto"
+              role="tooltip"
+            >
+              Open Issue
+            </span>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
               data-align="stretch"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="pr-1 prc-Text-Text-0ima0"
-                title="You're watching the repository."
-              >
-                Updated
-              </span>
-              <relative-time
-                datetime="2017-05-20T17:51:57.000Z"
+              <div
+                class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                data-align="start"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="space-between"
+                data-padding="none"
+                data-testid="notification-row"
+                data-wrap="nowrap"
+                title="I am a robot and this is a test!"
               >
-                May 20, 2017
-              </relative-time>
-            </div>
-            <div
-              class="flex gap-1"
-            >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+                <span
+                  class="truncate prc-Text-Text-0ima0"
+                >
+                  I am a robot and this is a test!
+                </span>
+                <span
+                  class="text-xxs ml-auto mr-2 opacity-50 hidden prc-Text-Text-0ima0"
+                />
+              </div>
+              <div
+                class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="wrap"
               >
+                <button
+                  data-testid="view-profile"
+                  title="gitify-app"
+                  type="button"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="14"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 14px;"
+                      width="14"
+                    />
+                  </div>
+                </button>
                 <div
                   class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
+                  data-align="stretch"
                   data-direction="horizontal"
                   data-gap="none"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="pr-1 prc-Text-Text-0ima0"
+                    title="You're watching the repository."
                   >
-                    1
+                    Updated
                   </span>
+                  <relative-time
+                    datetime="2017-05-20T17:51:57.000Z"
+                  >
+                    May 20, 2017
+                  </relative-time>
                 </div>
-              </span>
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
-              >
                 <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                  class="flex gap-1"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <span
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="octocat approved these changes"
                   >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-check text-gitify-icon-open"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
+                  </span>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="gitify-app requested changes"
                   >
-                    1
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-file-diff text-gitify-icon-closed"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
                   </span>
                 </div>
-              </span>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_9_-loading-announcement"
-          aria-label="Mark as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-done"
-          data-variant="invisible"
-          title="Mark as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_a_-loading-announcement"
-          aria-label="Mark as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-read"
-          data-variant="invisible"
-          title="Mark as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_b_-loading-announcement"
-          aria-label="Unsubscribe from thread"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-unsubscribe-from-thread"
-          data-variant="invisible"
-          title="Unsubscribe from thread"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell-slash"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <path
-              d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-            />
-          </svg>
-        </button>
+            <button
+              aria-describedby="_r_c_-loading-announcement"
+              aria-label="Mark as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-done"
+              data-variant="invisible"
+              title="Mark as done"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_d_-loading-announcement"
+              aria-label="Mark as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-read"
+              data-variant="invisible"
+              title="Mark as read"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_e_-loading-announcement"
+              aria-label="Unsubscribe from thread"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-unsubscribe-from-thread"
+              data-variant="invisible"
+              title="Unsubscribe from thread"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell-slash"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -2196,645 +2262,667 @@ exports[`renderer/components/notifications/NotificationRow.tsx should render its
 `;
 
 exports[`renderer/components/notifications/NotificationRow.tsx should render itself & its children - notification is read 1`] = `
-{
-  "asFragment": [Function],
-  "baseElement": <body>
-    <div>
-      <div
-        class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover opacity-50"
-        id="138661096"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_c_"
-            type="button"
-          >
-            <svg
-              aria-label="Open Issue"
-              class="octicon octicon-issue-opened text-gitify-icon-open"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="18"
-              overflow="visible"
-              role="img"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="18"
-            >
-              <path
-                d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-              />
-              <path
-                d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-              />
-            </svg>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="e"
-            id="_r_c_"
-            popover="auto"
-            role="tooltip"
-          >
-            Open Issue
-          </span>
-          <div
-            class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <div
-              class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-              data-align="start"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="space-between"
-              data-padding="none"
-              data-testid="notification-row"
-              data-wrap="nowrap"
-              title="I am a robot and this is a test!"
-            >
-              <span
-                class="truncate prc-Text-Text-0ima0"
-              >
-                I am a robot and this is a test!
-              </span>
-              <span
-                class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
-              />
-            </div>
+{
+  "asFragment": [Function],
+  "baseElement": <body>
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover opacity-50"
+            id="138661096"
+          >
             <div
-              class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
               data-direction="horizontal"
               data-gap="condensed"
               data-justify="start"
               data-padding="none"
-              data-wrap="wrap"
+              data-wrap="nowrap"
             >
               <button
-                data-testid="view-profile"
-                title="gitify-app"
+                aria-describedby="_r_g_"
                 type="button"
               >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
+                <svg
+                  aria-label="Open Issue"
+                  class="octicon octicon-issue-opened text-gitify-icon-open"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="18"
+                  overflow="visible"
+                  role="img"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="18"
                 >
-                  <img
-                    alt="gitify-app"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="14"
-                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                    style="--avatarSize-regular: 14px;"
-                    width="14"
+                  <path
+                    d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                   />
-                </div>
+                  <path
+                    d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                  />
+                </svg>
               </button>
+              <span
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="e"
+                id="_r_g_"
+                popover="auto"
+                role="tooltip"
+              >
+                Open Issue
+              </span>
               <div
-                class="prc-Stack-Stack-WJVsK"
+                class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
                 data-align="stretch"
-                data-direction="horizontal"
+                data-direction="vertical"
                 data-gap="none"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
               >
-                <span
-                  class="pr-1 prc-Text-Text-0ima0"
-                  title="You're watching the repository."
-                >
-                  Updated
-                </span>
-                <relative-time
-                  datetime="2017-05-20T17:51:57.000Z"
+                <div
+                  class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                  data-align="start"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="space-between"
+                  data-padding="none"
+                  data-testid="notification-row"
+                  data-wrap="nowrap"
+                  title="I am a robot and this is a test!"
                 >
-                  May 20, 2017
-                </relative-time>
-              </div>
-              <div
-                class="flex gap-1"
-              >
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="octocat approved these changes"
+                  <span
+                    class="truncate prc-Text-Text-0ima0"
+                  >
+                    I am a robot and this is a test!
+                  </span>
+                  <span
+                    class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
+                  />
+                </div>
+                <div
+                  class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="wrap"
                 >
+                  <button
+                    data-testid="view-profile"
+                    title="gitify-app"
+                    type="button"
+                  >
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-testid="avatar"
+                      data-wrap="nowrap"
+                    >
+                      <img
+                        alt="gitify-app"
+                        class="prc-Avatar-Avatar-ZRS-m"
+                        data-component="Avatar"
+                        height="14"
+                        src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                        style="--avatarSize-regular: 14px;"
+                        width="14"
+                      />
+                    </div>
+                  </button>
                   <div
                     class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
+                    data-align="stretch"
                     data-direction="horizontal"
                     data-gap="none"
                     data-justify="start"
                     data-padding="none"
                     data-wrap="nowrap"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-check text-gitify-icon-open"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
-                    >
-                      <path
-                        d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                      />
-                    </svg>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="pr-1 prc-Text-Text-0ima0"
+                      title="You're watching the repository."
                     >
-                      1
+                      Updated
                     </span>
+                    <relative-time
+                      datetime="2017-05-20T17:51:57.000Z"
+                    >
+                      May 20, 2017
+                    </relative-time>
                   </div>
-                </span>
-                <span
-                  class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                  data-size="small"
-                  data-variant="secondary"
-                  title="gitify-app requested changes"
-                >
                   <div
-                    class="prc-Stack-Stack-WJVsK"
-                    data-align="center"
-                    data-direction="horizontal"
-                    data-gap="none"
-                    data-justify="start"
-                    data-padding="none"
-                    data-wrap="nowrap"
+                    class="flex gap-1"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-file-diff text-gitify-icon-closed"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="12"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="12"
+                    <span
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="octocat approved these changes"
                     >
-                      <path
-                        d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                      />
-                    </svg>
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-check text-gitify-icon-open"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
+                    </span>
                     <span
-                      class="text-xxs px-1 prc-Text-Text-0ima0"
+                      class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                      data-size="small"
+                      data-variant="secondary"
+                      title="gitify-app requested changes"
                     >
-                      1
+                      <div
+                        class="prc-Stack-Stack-WJVsK"
+                        data-align="center"
+                        data-direction="horizontal"
+                        data-gap="none"
+                        data-justify="start"
+                        data-padding="none"
+                        data-wrap="nowrap"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-file-diff text-gitify-icon-closed"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="12"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="12"
+                        >
+                          <path
+                            d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                          />
+                        </svg>
+                        <span
+                          class="text-xxs px-1 prc-Text-Text-0ima0"
+                        >
+                          1
+                        </span>
+                      </div>
                     </span>
                   </div>
-                </span>
+                </div>
               </div>
             </div>
-          </div>
-        </div>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_d_-loading-announcement"
-            aria-label="Mark as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-done"
-            data-variant="invisible"
-            title="Mark as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_e_-loading-announcement"
-            aria-label="Mark as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-mark-as-read"
-            data-variant="invisible"
-            title="Mark as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_f_-loading-announcement"
-            aria-label="Unsubscribe from thread"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="notification-unsubscribe-from-thread"
-            data-variant="invisible"
-            title="Unsubscribe from thread"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-bell-slash"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <path
-                d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-              />
-            </svg>
-          </button>
+              <button
+                aria-describedby="_r_h_-loading-announcement"
+                aria-label="Mark as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-done"
+                data-variant="invisible"
+                title="Mark as done"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_i_-loading-announcement"
+                aria-label="Mark as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-mark-as-read"
+                data-variant="invisible"
+                title="Mark as read"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_j_-loading-announcement"
+                aria-label="Unsubscribe from thread"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="notification-unsubscribe-from-thread"
+                data-variant="invisible"
+                title="Unsubscribe from thread"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-bell-slash"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover opacity-50"
-      id="138661096"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_c_"
-          type="button"
-        >
-          <svg
-            aria-label="Open Issue"
-            class="octicon octicon-issue-opened text-gitify-icon-open"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="18"
-            overflow="visible"
-            role="img"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="18"
-          >
-            <path
-              d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
-            />
-            <path
-              d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
-            />
-          </svg>
-        </button>
-        <span
-          aria-hidden="true"
-          class="prc-TooltipV2-Tooltip-cYMVY"
-          data-direction="e"
-          id="_r_c_"
-          popover="auto"
-          role="tooltip"
-        >
-          Open Issue
-        </span>
         <div
-          class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="group relative border-b pl-2.75 pr-1 py-0.75 text-gitify-font border-gitify-notification-border hover:bg-gitify-notification-hover opacity-50"
+          id="138661096"
         >
           <div
-            class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
-            data-align="start"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="space-between"
-            data-padding="none"
-            data-testid="notification-row"
-            data-wrap="nowrap"
-            title="I am a robot and this is a test!"
-          >
-            <span
-              class="truncate prc-Text-Text-0ima0"
-            >
-              I am a robot and this is a test!
-            </span>
-            <span
-              class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
-            />
-          </div>
-          <div
-            class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+            class="prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="horizontal"
             data-gap="condensed"
             data-justify="start"
             data-padding="none"
-            data-wrap="wrap"
+            data-wrap="nowrap"
           >
             <button
-              data-testid="view-profile"
-              title="gitify-app"
+              aria-describedby="_r_g_"
               type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+              <svg
+                aria-label="Open Issue"
+                class="octicon octicon-issue-opened text-gitify-icon-open"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="18"
+                overflow="visible"
+                role="img"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="18"
               >
-                <img
-                  alt="gitify-app"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="14"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 14px;"
-                  width="14"
+                <path
+                  d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3Z"
                 />
-              </div>
+                <path
+                  d="M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0ZM1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0Z"
+                />
+              </svg>
             </button>
+            <span
+              aria-hidden="true"
+              class="prc-TooltipV2-Tooltip-cYMVY"
+              data-direction="e"
+              id="_r_g_"
+              popover="auto"
+              role="tooltip"
+            >
+              Open Issue
+            </span>
             <div
-              class="prc-Stack-Stack-WJVsK"
+              class="cursor-pointer text-sm w-full truncate prc-Stack-Stack-WJVsK"
               data-align="stretch"
-              data-direction="horizontal"
+              data-direction="vertical"
               data-gap="none"
               data-justify="start"
               data-padding="none"
               data-wrap="nowrap"
             >
-              <span
-                class="pr-1 prc-Text-Text-0ima0"
-                title="You're watching the repository."
-              >
-                Updated
-              </span>
-              <relative-time
-                datetime="2017-05-20T17:51:57.000Z"
+              <div
+                class="mb-0.5 truncate prc-Stack-Stack-WJVsK"
+                data-align="start"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="space-between"
+                data-padding="none"
+                data-testid="notification-row"
+                data-wrap="nowrap"
+                title="I am a robot and this is a test!"
               >
-                May 20, 2017
-              </relative-time>
-            </div>
-            <div
-              class="flex gap-1"
-            >
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="octocat approved these changes"
+                <span
+                  class="truncate prc-Text-Text-0ima0"
+                >
+                  I am a robot and this is a test!
+                </span>
+                <span
+                  class="text-xxs ml-auto mr-2 opacity-50 prc-Text-Text-0ima0"
+                />
+              </div>
+              <div
+                class="text-xs opacity-80 prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="wrap"
               >
+                <button
+                  data-testid="view-profile"
+                  title="gitify-app"
+                  type="button"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="14"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 14px;"
+                      width="14"
+                    />
+                  </div>
+                </button>
                 <div
                   class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
+                  data-align="stretch"
                   data-direction="horizontal"
                   data-gap="none"
                   data-justify="start"
                   data-padding="none"
                   data-wrap="nowrap"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-check text-gitify-icon-open"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
-                  >
-                    <path
-                      d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-                    />
-                  </svg>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="pr-1 prc-Text-Text-0ima0"
+                    title="You're watching the repository."
                   >
-                    1
+                    Updated
                   </span>
+                  <relative-time
+                    datetime="2017-05-20T17:51:57.000Z"
+                  >
+                    May 20, 2017
+                  </relative-time>
                 </div>
-              </span>
-              <span
-                class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
-                data-size="small"
-                data-variant="secondary"
-                title="gitify-app requested changes"
-              >
                 <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="none"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
+                  class="flex gap-1"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-file-diff text-gitify-icon-closed"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="12"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="12"
+                  <span
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="octocat approved these changes"
                   >
-                    <path
-                      d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
-                    />
-                  </svg>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-check text-gitify-icon-open"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
+                  </span>
                   <span
-                    class="text-xxs px-1 prc-Text-Text-0ima0"
+                    class="hover:bg-gitify-notification-pill-hover prc-Label-Label--LG6X"
+                    data-size="small"
+                    data-variant="secondary"
+                    title="gitify-app requested changes"
                   >
-                    1
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="none"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-file-diff text-gitify-icon-closed"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="12"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="12"
+                      >
+                        <path
+                          d="M1 1.75C1 .784 1.784 0 2.75 0h7.586c.464 0 .909.184 1.237.513l2.914 2.914c.329.328.513.773.513 1.237v9.586A1.75 1.75 0 0 1 13.25 16H2.75A1.75 1.75 0 0 1 1 14.25Zm1.75-.25a.25.25 0 0 0-.25.25v12.5c0 .138.112.25.25.25h10.5a.25.25 0 0 0 .25-.25V4.664a.25.25 0 0 0-.073-.177l-2.914-2.914a.25.25 0 0 0-.177-.073ZM8 3.25a.75.75 0 0 1 .75.75v1.5h1.5a.75.75 0 0 1 0 1.5h-1.5v1.5a.75.75 0 0 1-1.5 0V7h-1.5a.75.75 0 0 1 0-1.5h1.5V4A.75.75 0 0 1 8 3.25Zm-3 8a.75.75 0 0 1 .75-.75h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1-.75-.75Z"
+                        />
+                      </svg>
+                      <span
+                        class="text-xxs px-1 prc-Text-Text-0ima0"
+                      >
+                        1
+                      </span>
+                    </div>
                   </span>
                 </div>
-              </span>
+              </div>
             </div>
           </div>
-        </div>
-      </div>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_d_-loading-announcement"
-          aria-label="Mark as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-done"
-          data-variant="invisible"
-          title="Mark as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_e_-loading-announcement"
-          aria-label="Mark as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-mark-as-read"
-          data-variant="invisible"
-          title="Mark as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_f_-loading-announcement"
-          aria-label="Unsubscribe from thread"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="notification-unsubscribe-from-thread"
-          data-variant="invisible"
-          title="Unsubscribe from thread"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-bell-slash"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-notification-hover prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <path
-              d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
-            />
-          </svg>
-        </button>
+            <button
+              aria-describedby="_r_h_-loading-announcement"
+              aria-label="Mark as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-done"
+              data-variant="invisible"
+              title="Mark as done"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_i_-loading-announcement"
+              aria-label="Mark as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-mark-as-read"
+              data-variant="invisible"
+              title="Mark as read"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_j_-loading-announcement"
+              aria-label="Unsubscribe from thread"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="notification-unsubscribe-from-thread"
+              data-variant="invisible"
+              title="Unsubscribe from thread"
+              type="button"
+            >
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-bell-slash"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="m4.182 4.31.016.011 10.104 7.316.013.01 1.375.996a.75.75 0 1 1-.88 1.214L13.626 13H2.518a1.516 1.516 0 0 1-1.263-2.36l1.703-2.554A.255.255 0 0 0 3 7.947V5.305L.31 3.357a.75.75 0 1 1 .88-1.214Zm7.373 7.19L4.5 6.391v1.556c0 .346-.102.683-.294.97l-1.703 2.556a.017.017 0 0 0-.003.01c0 .005.002.009.005.012l.006.004.007.001ZM8 1.5c-.997 0-1.895.416-2.534 1.086A.75.75 0 1 1 4.38 1.55 5 5 0 0 1 13 5v2.373a.75.75 0 0 1-1.5 0V5A3.5 3.5 0 0 0 8 1.5ZM8 16a2 2 0 0 1-1.985-1.75c-.017-.137.097-.25.235-.25h3.5c.138 0 .252.113.235.25A2 2 0 0 1 8 16Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
index 418d22b09..37c845653 100644
--- a/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
+++ b/src/renderer/components/notifications/__snapshots__/RepositoryNotifications.test.tsx.snap
@@ -6,382 +6,404 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_4_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_6_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="open-repository"
+              data-variant="invisible"
+              title="Open repository ↗"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
               >
-                <img
-                  alt="gitify-app/notifications-test"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="18"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 18px;"
-                  width="18"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
                 >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app/notifications-test"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="18"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 18px;"
+                      width="18"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="gitify-app/notifications-test"
+                    >
+                      gitify-app/notifications-test
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+              <button
+                aria-describedby="_r_7_-loading-announcement"
+                aria-label="Mark repository as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-done"
+                data-variant="invisible"
+                title="Mark repository as done"
+                type="button"
               >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_8_-loading-announcement"
+                aria-label="Mark repository as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-read"
+                data-variant="invisible"
+                title="Mark repository as read"
+                type="button"
               >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_9_-loading-announcement"
+                aria-label="Hide repository notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-toggle"
+                data-variant="invisible"
+                title="Hide repository notifications"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div>
+            NotificationRow
+          </div>
+          <div>
+            NotificationRow
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
-          <button
-            aria-describedby="_r_5_-loading-announcement"
-            aria-label="Mark repository as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-done"
-            data-variant="invisible"
-            title="Mark repository as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
           <button
             aria-describedby="_r_6_-loading-announcement"
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
+            data-size="medium"
+            data-testid="open-repository"
             data-variant="invisible"
-            title="Mark repository as read"
+            title="Open repository ↗"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_7_-loading-announcement"
-            aria-label="Hide repository notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-toggle"
-            data-variant="invisible"
-            title="Hide repository notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="18"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    style="--avatarSize-regular: 18px;"
+                    width="18"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_4_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="open-repository"
-        data-variant="invisible"
-        title="Open repository ↗"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_7_-loading-announcement"
+              aria-label="Mark repository as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-done"
+              data-variant="invisible"
+              title="Mark repository as done"
+              type="button"
             >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="18"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 18px;"
-                width="18"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_8_-loading-announcement"
+              aria-label="Mark repository as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-read"
+              data-variant="invisible"
+              title="Mark repository as read"
+              type="button"
             >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_9_-loading-announcement"
+              aria-label="Hide repository notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-toggle"
+              data-variant="invisible"
+              title="Hide repository notifications"
+              type="button"
             >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_5_-loading-announcement"
-          aria-label="Mark repository as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-done"
-          data-variant="invisible"
-          title="Mark repository as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_6_-loading-announcement"
-          aria-label="Mark repository as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-read"
-          data-variant="invisible"
-          title="Mark repository as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_7_-loading-announcement"
-          aria-label="Hide repository notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-toggle"
-          data-variant="invisible"
-          title="Hide repository notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div>
+          NotificationRow
+        </div>
+        <div>
+          NotificationRow
+        </div>
       </div>
     </div>
-    <div>
-      NotificationRow
-    </div>
-    <div>
-      NotificationRow
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -443,382 +465,404 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should re
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_0_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_1_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="open-repository"
+              data-variant="invisible"
+              title="Open repository ↗"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
               >
-                <img
-                  alt="gitify-app/notifications-test"
-                  class="prc-Avatar-Avatar-ZRS-m"
-                  data-component="Avatar"
-                  height="18"
-                  src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                  style="--avatarSize-regular: 18px;"
-                  width="18"
-                />
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
                 >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <img
+                      alt="gitify-app/notifications-test"
+                      class="prc-Avatar-Avatar-ZRS-m"
+                      data-component="Avatar"
+                      height="18"
+                      src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                      style="--avatarSize-regular: 18px;"
+                      width="18"
+                    />
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="gitify-app/notifications-test"
+                    >
+                      gitify-app/notifications-test
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+              <button
+                aria-describedby="_r_2_-loading-announcement"
+                aria-label="Mark repository as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-done"
+                data-variant="invisible"
+                title="Mark repository as done"
+                type="button"
               >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-check"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_3_-loading-announcement"
+                aria-label="Mark repository as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-read"
+                data-variant="invisible"
+                title="Mark repository as read"
+                type="button"
               >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_4_-loading-announcement"
+                aria-label="Hide repository notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-toggle"
+                data-variant="invisible"
+                title="Hide repository notifications"
+                type="button"
+              >
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div>
+            NotificationRow
+          </div>
+          <div>
+            NotificationRow
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
           <button
             aria-describedby="_r_1_-loading-announcement"
-            aria-label="Mark repository as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-done"
+            data-size="medium"
+            data-testid="open-repository"
             data-variant="invisible"
-            title="Mark repository as done"
+            title="Open repository ↗"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_2_-loading-announcement"
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_3_-loading-announcement"
-            aria-label="Hide repository notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-toggle"
-            data-variant="invisible"
-            title="Hide repository notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <img
+                    alt="gitify-app/notifications-test"
+                    class="prc-Avatar-Avatar-ZRS-m"
+                    data-component="Avatar"
+                    height="18"
+                    src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
+                    style="--avatarSize-regular: 18px;"
+                    width="18"
+                  />
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-repository prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_0_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="open-repository"
-        data-variant="invisible"
-        title="Open repository ↗"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_2_-loading-announcement"
+              aria-label="Mark repository as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-done"
+              data-variant="invisible"
+              title="Mark repository as done"
+              type="button"
             >
-              <img
-                alt="gitify-app/notifications-test"
-                class="prc-Avatar-Avatar-ZRS-m"
-                data-component="Avatar"
-                height="18"
-                src="https://avatars.githubusercontent.com/u/133795385?s=200&v=4"
-                style="--avatarSize-regular: 18px;"
-                width="18"
-              />
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-check"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
               >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+                <path
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_3_-loading-announcement"
+              aria-label="Mark repository as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-read"
+              data-variant="invisible"
+              title="Mark repository as read"
+              type="button"
             >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_4_-loading-announcement"
+              aria-label="Hide repository notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-toggle"
+              data-variant="invisible"
+              title="Hide repository notifications"
+              type="button"
             >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_1_-loading-announcement"
-          aria-label="Mark repository as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-done"
-          data-variant="invisible"
-          title="Mark repository as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_2_-loading-announcement"
-          aria-label="Mark repository as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-read"
-          data-variant="invisible"
-          title="Mark repository as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_3_-loading-announcement"
-          aria-label="Hide repository notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-toggle"
-          data-variant="invisible"
-          title="Hide repository notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div>
+          NotificationRow
+        </div>
+        <div>
+          NotificationRow
+        </div>
       </div>
     </div>
-    <div>
-      NotificationRow
-    </div>
-    <div>
-      NotificationRow
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -880,586 +924,619 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should to
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_o_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_v_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="open-repository"
+              data-variant="invisible"
+              title="Open repository ↗"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
+              >
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-feed-person"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="18"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="18"
+                    >
+                      <path
+                        d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                      />
+                    </svg>
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="gitify-app/notifications-test"
+                    >
+                      gitify-app/notifications-test
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_10_-loading-announcement"
+                aria-label="Mark repository as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-done"
+                data-variant="invisible"
+                title="Mark repository as done"
+                type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
-                  height="18"
+                  height="16"
                   overflow="visible"
                   style="vertical-align: text-bottom;"
                   viewBox="0 0 16 16"
-                  width="18"
+                  width="16"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+              </button>
+              <button
+                aria-describedby="_r_11_-loading-announcement"
+                aria-label="Mark repository as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-read"
+                data-variant="invisible"
+                title="Mark repository as read"
+                type="button"
               >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_12_-loading-announcement"
+                aria-label="Show repository notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-toggle"
+                data-variant="invisible"
+                title="Show repository notifications"
+                type="button"
               >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
-        <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="horizontal"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_p_-loading-announcement"
-            aria-label="Mark repository as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-done"
-            data-variant="invisible"
-            title="Mark repository as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_q_-loading-announcement"
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_r_-loading-announcement"
-            aria-label="Show repository notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-toggle"
-            data-variant="invisible"
-            title="Show repository notifications"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-right"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
-              />
-            </svg>
-          </button>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-right"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M6.22 3.22a.75.75 0 0 1 1.06 0l4.25 4.25a.75.75 0 0 1 0 1.06l-4.25 4.25a.751.751 0 0 1-1.042-.018.751.751 0 0 1-.018-1.042L9.94 8 6.22 4.28a.75.75 0 0 1 0-1.06Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_s_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_14_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="open-repository"
+              data-variant="invisible"
+              title="Open repository ↗"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
+              >
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-feed-person"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="18"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="18"
+                    >
+                      <path
+                        d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                      />
+                    </svg>
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="gitify-app/notifications-test"
+                    >
+                      gitify-app/notifications-test
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_15_-loading-announcement"
+                aria-label="Mark repository as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-done"
+                data-variant="invisible"
+                title="Mark repository as done"
+                type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
-                  height="18"
+                  height="16"
                   overflow="visible"
                   style="vertical-align: text-bottom;"
                   viewBox="0 0 16 16"
-                  width="18"
+                  width="16"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+              </button>
+              <button
+                aria-describedby="_r_16_-loading-announcement"
+                aria-label="Mark repository as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-read"
+                data-variant="invisible"
+                title="Mark repository as read"
+                type="button"
               >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_17_-loading-announcement"
+                aria-label="Hide repository notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-toggle"
+                data-variant="invisible"
+                title="Hide repository notifications"
+                type="button"
               >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div>
+            NotificationRow
+          </div>
+          <div>
+            NotificationRow
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_t_-loading-announcement"
-            aria-label="Mark repository as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-done"
-            data-variant="invisible"
-            title="Mark repository as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_u_-loading-announcement"
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_v_-loading-announcement"
-            aria-label="Hide repository notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            aria-describedby="_r_14_-loading-announcement"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-toggle"
+            data-size="medium"
+            data-testid="open-repository"
             data-variant="invisible"
-            title="Hide repository notifications"
+            title="Open repository ↗"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="18"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="18"
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_s_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="open-repository"
-        data-variant="invisible"
-        title="Open repository ↗"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_15_-loading-announcement"
+              aria-label="Mark repository as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-done"
+              data-variant="invisible"
+              title="Mark repository as done"
+              type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-feed-person"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
-                height="18"
+                height="16"
                 overflow="visible"
                 style="vertical-align: text-bottom;"
                 viewBox="0 0 16 16"
-                width="18"
+                width="16"
               >
                 <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
-              >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+            </button>
+            <button
+              aria-describedby="_r_16_-loading-announcement"
+              aria-label="Mark repository as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-read"
+              data-variant="invisible"
+              title="Mark repository as read"
+              type="button"
             >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_17_-loading-announcement"
+              aria-label="Hide repository notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-toggle"
+              data-variant="invisible"
+              title="Hide repository notifications"
+              type="button"
             >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_t_-loading-announcement"
-          aria-label="Mark repository as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-done"
-          data-variant="invisible"
-          title="Mark repository as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_u_-loading-announcement"
-          aria-label="Mark repository as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-read"
-          data-variant="invisible"
-          title="Mark repository as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_v_-loading-announcement"
-          aria-label="Hide repository notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-toggle"
-          data-variant="invisible"
-          title="Hide repository notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div>
+          NotificationRow
+        </div>
+        <div>
+          NotificationRow
+        </div>
       </div>
     </div>
-    <div>
-      NotificationRow
-    </div>
-    <div>
-      NotificationRow
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -1521,396 +1598,418 @@ exports[`renderer/components/notifications/RepositoryNotifications.tsx should us
   "baseElement": <body>
     <div>
       <div
-        class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <button
-          aria-describedby="_r_k_-loading-announcement"
-          class="prc-Button-ButtonBase-c50BI"
-          data-has-count="true"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="open-repository"
-          data-variant="invisible"
-          title="Open repository ↗"
-          type="button"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <span
-            class="prc-Button-ButtonContent-HKbr-"
-            data-align="center"
-            data-component="buttonContent"
+          <div
+            class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-Label-pTQ3x"
-              data-component="text"
+            <button
+              aria-describedby="_r_q_-loading-announcement"
+              class="prc-Button-ButtonBase-c50BI"
+              data-has-count="true"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="open-repository"
+              data-variant="invisible"
+              title="Open repository ↗"
+              type="button"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
+              <span
+                class="prc-Button-ButtonContent-HKbr-"
                 data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="avatar"
-                data-wrap="nowrap"
+                data-component="buttonContent"
+              >
+                <span
+                  class="prc-Button-Label-pTQ3x"
+                  data-component="text"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-testid="avatar"
+                    data-wrap="nowrap"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-feed-person"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="18"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="18"
+                    >
+                      <path
+                        d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                      />
+                    </svg>
+                    <div
+                      class="prc-Truncate-Truncate-A9Wn6"
+                      data-inline="true"
+                      style="--truncate-max-width: 280px;"
+                      title="gitify-app/notifications-test"
+                    >
+                      gitify-app/notifications-test
+                    </div>
+                  </div>
+                </span>
+                <span
+                  class="prc-Button-VisualWrap-Db-eB"
+                  data-component="trailingVisual"
+                >
+                  <span
+                    aria-hidden="true"
+                    class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                    data-component="ButtonCounter"
+                    data-scheme="secondary"
+                  >
+                    2
+                  </span>
+                  <span
+                    class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                  >
+                     (
+                    2
+                    )
+                  </span>
+                </span>
+              </span>
+            </button>
+            <div
+              class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="horizontal"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <button
+                aria-describedby="_r_r_-loading-announcement"
+                aria-label="Mark repository as done"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-done"
+                data-variant="invisible"
+                title="Mark repository as done"
+                type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-feed-person"
+                  class="octicon octicon-check"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
-                  height="18"
+                  height="16"
                   overflow="visible"
                   style="vertical-align: text-bottom;"
                   viewBox="0 0 16 16"
-                  width="18"
+                  width="16"
                 >
                   <path
-                    d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                   />
                 </svg>
-                <div
-                  class="prc-Truncate-Truncate-A9Wn6"
-                  data-inline="true"
-                  style="--truncate-max-width: 280px;"
-                  title="gitify-app/notifications-test"
-                >
-                  gitify-app/notifications-test
-                </div>
-              </div>
-            </span>
-            <span
-              class="prc-Button-VisualWrap-Db-eB"
-              data-component="trailingVisual"
-            >
-              <span
-                aria-hidden="true"
-                class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-                data-component="ButtonCounter"
-                data-scheme="secondary"
+              </button>
+              <button
+                aria-describedby="_r_s_-loading-announcement"
+                aria-label="Mark repository as read"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-mark-as-read"
+                data-variant="invisible"
+                title="Mark repository as read"
+                type="button"
               >
-                2
-              </span>
-              <span
-                class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-read"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                  />
+                </svg>
+              </button>
+              <button
+                aria-describedby="_r_t_-loading-announcement"
+                aria-label="Hide repository notifications"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="small"
+                data-testid="repository-toggle"
+                data-variant="invisible"
+                title="Hide repository notifications"
+                type="button"
               >
-                 (
-                2
-                )
-              </span>
-            </span>
-          </span>
-        </button>
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-chevron-down"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
+                >
+                  <path
+                    d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                  />
+                </svg>
+              </button>
+            </div>
+          </div>
+          <div>
+            NotificationRow
+          </div>
+          <div>
+            NotificationRow
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-          data-align="center"
+          class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
+          data-align="stretch"
           data-direction="horizontal"
-          data-gap="none"
           data-justify="start"
           data-padding="none"
           data-wrap="nowrap"
         >
           <button
-            aria-describedby="_r_l_-loading-announcement"
-            aria-label="Mark repository as done"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-done"
-            data-variant="invisible"
-            title="Mark repository as done"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-check"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_m_-loading-announcement"
-            aria-label="Mark repository as read"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-mark-as-read"
-            data-variant="invisible"
-            title="Mark repository as read"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-read"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-              />
-            </svg>
-          </button>
-          <button
-            aria-describedby="_r_n_-loading-announcement"
-            aria-label="Hide repository notifications"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
+            aria-describedby="_r_q_-loading-announcement"
+            class="prc-Button-ButtonBase-c50BI"
+            data-has-count="true"
             data-loading="false"
             data-no-visuals="true"
-            data-size="small"
-            data-testid="repository-toggle"
+            data-size="medium"
+            data-testid="open-repository"
             data-variant="invisible"
-            title="Hide repository notifications"
+            title="Open repository ↗"
             type="button"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-chevron-down"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
+            <span
+              class="prc-Button-ButtonContent-HKbr-"
+              data-align="center"
+              data-component="buttonContent"
             >
-              <path
-                d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-              />
-            </svg>
+              <span
+                class="prc-Button-Label-pTQ3x"
+                data-component="text"
+              >
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-testid="avatar"
+                  data-wrap="nowrap"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-feed-person"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="18"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="18"
+                  >
+                    <path
+                      d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                    />
+                  </svg>
+                  <div
+                    class="prc-Truncate-Truncate-A9Wn6"
+                    data-inline="true"
+                    style="--truncate-max-width: 280px;"
+                    title="gitify-app/notifications-test"
+                  >
+                    gitify-app/notifications-test
+                  </div>
+                </div>
+              </span>
+              <span
+                class="prc-Button-VisualWrap-Db-eB"
+                data-component="trailingVisual"
+              >
+                <span
+                  aria-hidden="true"
+                  class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
+                  data-component="ButtonCounter"
+                  data-scheme="secondary"
+                >
+                  2
+                </span>
+                <span
+                  class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+                >
+                   (
+                  2
+                  )
+                </span>
+              </span>
+            </span>
           </button>
-        </div>
-      </div>
-      <div>
-        NotificationRow
-      </div>
-      <div>
-        NotificationRow
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="group relative pr-1 py-0.5 bg-gitify-repository opacity-50 prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_k_-loading-announcement"
-        class="prc-Button-ButtonBase-c50BI"
-        data-has-count="true"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="open-repository"
-        data-variant="invisible"
-        title="Open repository ↗"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-testid="avatar"
-              data-wrap="nowrap"
+            <button
+              aria-describedby="_r_r_-loading-announcement"
+              aria-label="Mark repository as done"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-done"
+              data-variant="invisible"
+              title="Mark repository as done"
+              type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-feed-person"
+                class="octicon octicon-check"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
-                height="18"
+                height="16"
                 overflow="visible"
                 style="vertical-align: text-bottom;"
                 viewBox="0 0 16 16"
-                width="18"
+                width="16"
               >
                 <path
-                  d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16Zm.847-8.145a2.502 2.502 0 1 0-1.694 0C5.471 8.261 4 9.775 4 11c0 .395.145.995 1 .995h6c.855 0 1-.6 1-.995 0-1.224-1.47-2.74-3.153-3.145Z"
+                  d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
                 />
               </svg>
-              <div
-                class="prc-Truncate-Truncate-A9Wn6"
-                data-inline="true"
-                style="--truncate-max-width: 280px;"
-                title="gitify-app/notifications-test"
-              >
-                gitify-app/notifications-test
-              </div>
-            </div>
-          </span>
-          <span
-            class="prc-Button-VisualWrap-Db-eB"
-            data-component="trailingVisual"
-          >
-            <span
-              aria-hidden="true"
-              class="prc-Button-CounterLabel-f5-4u prc-CounterLabel-CounterLabel-ZwXPe"
-              data-component="ButtonCounter"
-              data-scheme="secondary"
+            </button>
+            <button
+              aria-describedby="_r_s_-loading-announcement"
+              aria-label="Mark repository as read"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-mark-as-read"
+              data-variant="invisible"
+              title="Mark repository as read"
+              type="button"
             >
-              2
-            </span>
-            <span
-              class="prc-VisuallyHidden-VisuallyHidden-UNWQp"
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-read"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
+                />
+              </svg>
+            </button>
+            <button
+              aria-describedby="_r_t_-loading-announcement"
+              aria-label="Hide repository notifications"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="small"
+              data-testid="repository-toggle"
+              data-variant="invisible"
+              title="Hide repository notifications"
+              type="button"
             >
-               (
-              2
-              )
-            </span>
-          </span>
-        </span>
-      </button>
-      <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <button
-          aria-describedby="_r_l_-loading-announcement"
-          aria-label="Mark repository as done"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-done"
-          data-variant="invisible"
-          title="Mark repository as done"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-check"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M13.78 4.22a.75.75 0 0 1 0 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L2.22 9.28a.751.751 0 0 1 .018-1.042.751.751 0 0 1 1.042-.018L6 10.94l6.72-6.72a.75.75 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_m_-loading-announcement"
-          aria-label="Mark repository as read"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-mark-as-read"
-          data-variant="invisible"
-          title="Mark repository as read"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-read"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.115.65a1.752 1.752 0 0 1 1.77 0l6.25 3.663c.536.314.865.889.865 1.51v6.427A1.75 1.75 0 0 1 14.25 14H1.75A1.75 1.75 0 0 1 0 12.25V5.823c0-.621.33-1.196.865-1.51Zm1.011 1.293a.252.252 0 0 0-.252 0l-5.72 3.353L6.468 7.76a2.748 2.748 0 0 1 3.066 0l4.312-2.464-5.719-3.353ZM13.15 12.5 8.772 9.06a1.25 1.25 0 0 0-1.544 0L2.85 12.5Zm1.35-5.85-3.687 2.106 3.687 2.897ZM5.187 8.756 1.5 6.65v5.003Z"
-            />
-          </svg>
-        </button>
-        <button
-          aria-describedby="_r_n_-loading-announcement"
-          aria-label="Hide repository notifications"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="small"
-          data-testid="repository-toggle"
-          data-variant="invisible"
-          title="Hide repository notifications"
-          type="button"
-        >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-chevron-down"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
-            />
-          </svg>
-        </button>
+              <svg
+                aria-hidden="true"
+                class="octicon octicon-chevron-down"
+                display="inline-block"
+                fill="currentColor"
+                focusable="false"
+                height="16"
+                overflow="visible"
+                style="vertical-align: text-bottom;"
+                viewBox="0 0 16 16"
+                width="16"
+              >
+                <path
+                  d="M12.78 5.22a.749.749 0 0 1 0 1.06l-4.25 4.25a.749.749 0 0 1-1.06 0L3.22 6.28a.749.749 0 1 1 1.06-1.06L8 8.939l3.72-3.719a.749.749 0 0 1 1.06 0Z"
+                />
+              </svg>
+            </button>
+          </div>
+        </div>
+        <div>
+          NotificationRow
+        </div>
+        <div>
+          NotificationRow
+        </div>
       </div>
     </div>
-    <div>
-      NotificationRow
-    </div>
-    <div>
-      NotificationRow
-    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/primitives/CustomCounter.test.tsx b/src/renderer/components/primitives/CustomCounter.test.tsx
index d477615c5..3533ca63d 100644
--- a/src/renderer/components/primitives/CustomCounter.test.tsx
+++ b/src/renderer/components/primitives/CustomCounter.test.tsx
@@ -1,10 +1,9 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { CustomCounter } from './CustomCounter';
 
 describe('renderer/components/primitives/CustomCounter.tsx', () => {
   it('should render itself & its children', () => {
-    const tree = render(<CustomCounter value={100} />);
+    const tree = renderWithAppContext(<CustomCounter value={100} />);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/primitives/EmojiText.test.tsx b/src/renderer/components/primitives/EmojiText.test.tsx
index 4a374c56b..3d1186fe7 100644
--- a/src/renderer/components/primitives/EmojiText.test.tsx
+++ b/src/renderer/components/primitives/EmojiText.test.tsx
@@ -1,5 +1,6 @@
-import { act, render } from '@testing-library/react';
+import { act } from '@testing-library/react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { EmojiText, type IEmojiText } from './EmojiText';
 
 describe('renderer/components/primitives/EmojiText.tsx', () => {
@@ -8,10 +9,10 @@ describe('renderer/components/primitives/EmojiText.tsx', () => {
       text: '🍺',
     };
 
-    let tree: ReturnType<typeof render> | null = null;
+    let tree: ReturnType<typeof renderWithAppContext> | null = null;
 
     await act(async () => {
-      tree = render(<EmojiText {...props} />);
+      tree = renderWithAppContext(<EmojiText {...props} />);
     });
 
     expect(tree).toMatchSnapshot();
diff --git a/src/renderer/components/primitives/Footer.test.tsx b/src/renderer/components/primitives/Footer.test.tsx
index e932c704e..6f8cb1fa4 100644
--- a/src/renderer/components/primitives/Footer.test.tsx
+++ b/src/renderer/components/primitives/Footer.test.tsx
@@ -1,16 +1,17 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Footer } from './Footer';
 
 describe('renderer/components/primitives/Footer.tsx', () => {
   it('should render itself & its children - space-between', () => {
-    const tree = render(<Footer justify="space-between">Test</Footer>);
+    const tree = renderWithAppContext(
+      <Footer justify="space-between">Test</Footer>,
+    );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children - end', () => {
-    const tree = render(<Footer justify="end">Test</Footer>);
+    const tree = renderWithAppContext(<Footer justify="end">Test</Footer>);
 
     expect(tree).toMatchSnapshot();
   });
diff --git a/src/renderer/components/primitives/Header.test.tsx b/src/renderer/components/primitives/Header.test.tsx
index bc90e3d57..7a1f665b2 100644
--- a/src/renderer/components/primitives/Header.test.tsx
+++ b/src/renderer/components/primitives/Header.test.tsx
@@ -1,9 +1,9 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { MarkGithubIcon } from '@primer/octicons-react';
 
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Header } from './Header';
 
 const mockNavigate = jest.fn();
@@ -13,20 +13,22 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('renderer/components/primitives/Header.tsx', () => {
-  const fetchNotifications = jest.fn();
+  const mockFetchNotifications = jest.fn();
 
   afterEach(() => {
     jest.resetAllMocks();
   });
 
   it('should render itself & its children', () => {
-    const tree = render(<Header icon={MarkGithubIcon}>Test Header</Header>);
+    const tree = renderWithAppContext(
+      <Header icon={MarkGithubIcon}>Test Header</Header>,
+    );
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should navigate back', async () => {
-    render(<Header icon={MarkGithubIcon}>Test Header</Header>);
+    renderWithAppContext(<Header icon={MarkGithubIcon}>Test Header</Header>);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -34,21 +36,16 @@ describe('renderer/components/primitives/Header.tsx', () => {
   });
 
   it('should navigate back and fetch notifications', async () => {
-    render(
-      <AppContext.Provider
-        value={{
-          fetchNotifications,
-        }}
-      >
-        <Header fetchOnBack icon={MarkGithubIcon}>
-          Test Header
-        </Header>
-      </AppContext.Provider>,
+    renderWithAppContext(
+      <Header fetchOnBack icon={MarkGithubIcon}>
+        Test Header
+      </Header>,
+      { fetchNotifications: mockFetchNotifications },
     );
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
     expect(mockNavigate).toHaveBeenNthCalledWith(1, -1);
-    expect(fetchNotifications).toHaveBeenCalledTimes(1);
+    expect(mockFetchNotifications).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/renderer/components/primitives/HoverButton.test.tsx b/src/renderer/components/primitives/HoverButton.test.tsx
index adc447273..3956da573 100644
--- a/src/renderer/components/primitives/HoverButton.test.tsx
+++ b/src/renderer/components/primitives/HoverButton.test.tsx
@@ -1,14 +1,13 @@
-import { render } from '@testing-library/react';
-
 import { MarkGithubIcon } from '@primer/octicons-react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { HoverButton } from './HoverButton';
 
 describe('renderer/components/primitives/HoverButton.tsx', () => {
   it('should render', () => {
     const mockAction = jest.fn();
 
-    const tree = render(
+    const tree = renderWithAppContext(
       <HoverButton
         action={mockAction}
         icon={MarkGithubIcon}
@@ -22,7 +21,7 @@ describe('renderer/components/primitives/HoverButton.tsx', () => {
   it('should render - disabled', () => {
     const mockAction = jest.fn();
 
-    const tree = render(
+    const tree = renderWithAppContext(
       <HoverButton
         action={mockAction}
         enabled={false}
diff --git a/src/renderer/components/primitives/HoverGroup.test.tsx b/src/renderer/components/primitives/HoverGroup.test.tsx
index c8fc8bd9a..1504922db 100644
--- a/src/renderer/components/primitives/HoverGroup.test.tsx
+++ b/src/renderer/components/primitives/HoverGroup.test.tsx
@@ -1,10 +1,9 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { HoverGroup } from './HoverGroup';
 
 describe('renderer/components/primitives/HoverGroup.tsx', () => {
   it('should render', () => {
-    const tree = render(
+    const tree = renderWithAppContext(
       <HoverGroup bgColor="group-hover:bg-gitify-repository">
         Hover Group
       </HoverGroup>,
diff --git a/src/renderer/components/primitives/Title.test.tsx b/src/renderer/components/primitives/Title.test.tsx
index b134bc91e..eb0b7b2d7 100644
--- a/src/renderer/components/primitives/Title.test.tsx
+++ b/src/renderer/components/primitives/Title.test.tsx
@@ -1,18 +1,19 @@
-import { render } from '@testing-library/react';
-
 import { PersonFillIcon } from '@primer/octicons-react';
 
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { Title } from './Title';
 
 describe('renderer/routes/components/primitives/Title.tsx', () => {
   it('should render the title - default size', async () => {
-    const { container } = render(<Title icon={PersonFillIcon}>Legend</Title>);
+    const { container } = renderWithAppContext(
+      <Title icon={PersonFillIcon}>Legend</Title>,
+    );
 
     expect(container).toMatchSnapshot();
   });
 
   it('should render the title - specific size', async () => {
-    const { container } = render(
+    const { container } = renderWithAppContext(
       <Title icon={PersonFillIcon} size={4}>
         Legend
       </Title>,
diff --git a/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap
index e886442b1..97e8c2405 100644
--- a/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/CustomCounter.test.tsx.snap
@@ -5,19 +5,41 @@ exports[`renderer/components/primitives/CustomCounter.tsx should render itself &
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <span
-        class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        100
-      </span>
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <span
+            class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+          >
+            100
+          </span>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <span
-      class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      100
-    </span>
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <span
+          class="px-2 py-0.25 rounded-full text-[10px] font-medium leading-none min-w-[16px] text-gitify-counter-text bg-gitify-counter-secondary prc-Text-Text-0ima0"
+        >
+          100
+        </span>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
index 9474fc8e9..1f1db6f7c 100644
--- a/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/EmojiText.test.tsx.snap
@@ -6,27 +6,49 @@ exports[`renderer/components/primitives/EmojiText.tsx should render 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="text-7xl"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <img
-          alt="🍺"
-          class="emoji"
-          draggable="false"
-          src="/mock/images/assets/1f37a.svg"
-        />
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="text-7xl"
+          >
+            <img
+              alt="🍺"
+              class="emoji"
+              draggable="false"
+              src="/mock/images/assets/1f37a.svg"
+            />
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="text-7xl"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <img
-        alt="🍺"
-        class="emoji"
-        draggable="false"
-        src="/mock/images/assets/1f37a.svg"
-      />
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="text-7xl"
+        >
+          <img
+            alt="🍺"
+            class="emoji"
+            draggable="false"
+            src="/mock/images/assets/1f37a.svg"
+          />
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap
index d2f027b24..9cfa61637 100644
--- a/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Footer.test.tsx.snap
@@ -6,34 +6,56 @@ exports[`renderer/components/primitives/Footer.tsx should render itself & its ch
   "baseElement": <body>
     <div>
       <div
-        class="left-sidebar bg-gitify-footer"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="end"
-          data-padding="condensed"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          Test
+          <div
+            class="left-sidebar bg-gitify-footer"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="horizontal"
+              data-justify="end"
+              data-padding="condensed"
+              data-wrap="nowrap"
+            >
+              Test
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="left-sidebar bg-gitify-footer"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="end"
-        data-padding="condensed"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        Test
+        <div
+          class="left-sidebar bg-gitify-footer"
+        >
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="end"
+            data-padding="condensed"
+            data-wrap="nowrap"
+          >
+            Test
+          </div>
+        </div>
       </div>
     </div>
   </div>,
@@ -97,34 +119,56 @@ exports[`renderer/components/primitives/Footer.tsx should render itself & its ch
   "baseElement": <body>
     <div>
       <div
-        class="left-sidebar bg-gitify-footer"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="condensed"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          Test
+          <div
+            class="left-sidebar bg-gitify-footer"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="horizontal"
+              data-justify="space-between"
+              data-padding="condensed"
+              data-wrap="nowrap"
+            >
+              Test
+            </div>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="left-sidebar bg-gitify-footer"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="space-between"
-        data-padding="condensed"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        Test
+        <div
+          class="left-sidebar bg-gitify-footer"
+        >
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="space-between"
+            data-padding="condensed"
+            data-wrap="nowrap"
+          >
+            Test
+          </div>
+        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
index 8c8ad8ee9..9b8488282 100644
--- a/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Header.test.tsx.snap
@@ -6,62 +6,40 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
   "baseElement": <body>
     <div>
       <div
-        class="pl-4 pr-5 pt-3 pb-1"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <button
-            aria-describedby="_r_0_-loading-announcement"
-            aria-labelledby="Go Back"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="header-nav-back"
-            data-variant="invisible"
-            type="button"
+          <div
+            class="pl-4 pr-5 pt-3 pb-1"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-arrow-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
-          <legend>
             <div
-              class="mb-2"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="horizontal"
+              data-justify="space-between"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="title-test-header"
+              <button
+                aria-describedby="_r_1_-loading-announcement"
+                aria-labelledby="Go Back"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
+                data-loading="false"
+                data-no-visuals="true"
+                data-size="medium"
+                data-testid="header-nav-back"
+                data-variant="invisible"
+                type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="octicon octicon-mark-github"
+                  class="octicon octicon-arrow-left"
                   display="inline-block"
                   fill="currentColor"
                   focusable="false"
@@ -72,79 +50,90 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
                   width="16"
                 >
                   <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
                   />
                 </svg>
-                <h4
-                  class="prc-Heading-Heading-6CmGO"
+              </button>
+              <legend>
+                <div
+                  class="mb-2"
                 >
-                  Test Header
-                </h4>
-              </div>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                    id="title-test-header"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-mark-github"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                      />
+                    </svg>
+                    <h4
+                      class="prc-Heading-Heading-6CmGO"
+                    >
+                      Test Header
+                    </h4>
+                  </div>
+                </div>
+              </legend>
             </div>
-          </legend>
+          </div>
         </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="pl-4 pr-5 pt-3 pb-1"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="horizontal"
-        data-justify="space-between"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <button
-          aria-describedby="_r_0_-loading-announcement"
-          aria-labelledby="Go Back"
-          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-          data-component="IconButton"
-          data-loading="false"
-          data-no-visuals="true"
-          data-size="medium"
-          data-testid="header-nav-back"
-          data-variant="invisible"
-          type="button"
+        <div
+          class="pl-4 pr-5 pt-3 pb-1"
         >
-          <svg
-            aria-hidden="true"
-            class="octicon octicon-arrow-left"
-            display="inline-block"
-            fill="currentColor"
-            focusable="false"
-            height="16"
-            overflow="visible"
-            style="vertical-align: text-bottom;"
-            viewBox="0 0 16 16"
-            width="16"
-          >
-            <path
-              d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-            />
-          </svg>
-        </button>
-        <legend>
           <div
-            class="mb-2"
+            class="prc-Stack-Stack-WJVsK"
+            data-align="stretch"
+            data-direction="horizontal"
+            data-justify="space-between"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="center"
-              data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-              id="title-test-header"
+            <button
+              aria-describedby="_r_1_-loading-announcement"
+              aria-labelledby="Go Back"
+              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+              data-component="IconButton"
+              data-loading="false"
+              data-no-visuals="true"
+              data-size="medium"
+              data-testid="header-nav-back"
+              data-variant="invisible"
+              type="button"
             >
               <svg
                 aria-hidden="true"
-                class="octicon octicon-mark-github"
+                class="octicon octicon-arrow-left"
                 display="inline-block"
                 fill="currentColor"
                 focusable="false"
@@ -155,17 +144,50 @@ exports[`renderer/components/primitives/Header.tsx should render itself & its ch
                 width="16"
               >
                 <path
-                  d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                  d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
                 />
               </svg>
-              <h4
-                class="prc-Heading-Heading-6CmGO"
+            </button>
+            <legend>
+              <div
+                class="mb-2"
               >
-                Test Header
-              </h4>
-            </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                  id="title-test-header"
+                >
+                  <svg
+                    aria-hidden="true"
+                    class="octicon octicon-mark-github"
+                    display="inline-block"
+                    fill="currentColor"
+                    focusable="false"
+                    height="16"
+                    overflow="visible"
+                    style="vertical-align: text-bottom;"
+                    viewBox="0 0 16 16"
+                    width="16"
+                  >
+                    <path
+                      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    />
+                  </svg>
+                  <h4
+                    class="prc-Heading-Heading-6CmGO"
+                  >
+                    Test Header
+                  </h4>
+                </div>
+              </div>
+            </legend>
           </div>
-        </legend>
+        </div>
       </div>
     </div>
   </div>,
diff --git a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
index 2f8faf61f..fa46e4d70 100644
--- a/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/HoverButton.test.tsx.snap
@@ -4,9 +4,31 @@ exports[`renderer/components/primitives/HoverButton.tsx should render - disabled
 {
   "asFragment": [Function],
   "baseElement": <body>
-    <div />
+    <div>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        />
+      </div>
+    </div>
   </body>,
-  "container": <div />,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      />
+    </div>
+  </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
   "findAllByDisplayValue": [Function],
@@ -66,69 +88,91 @@ exports[`renderer/components/primitives/HoverButton.tsx should render 1`] = `
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <button
-        aria-describedby="_r_0_-loading-announcement"
-        aria-label="Hover Button"
-        class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-        data-component="IconButton"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="small"
-        data-testid="hover-button"
-        data-variant="invisible"
-        title="Hover Button"
-        type="button"
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-mark-github"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <path
-            d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-          />
-        </svg>
-      </button>
+          <button
+            aria-describedby="_r_1_-loading-announcement"
+            aria-label="Hover Button"
+            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+            data-component="IconButton"
+            data-loading="false"
+            data-no-visuals="true"
+            data-size="small"
+            data-testid="hover-button"
+            data-variant="invisible"
+            title="Hover Button"
+            type="button"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-mark-github"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+              />
+            </svg>
+          </button>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <button
-      aria-describedby="_r_0_-loading-announcement"
-      aria-label="Hover Button"
-      class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-      data-component="IconButton"
-      data-loading="false"
-      data-no-visuals="true"
-      data-size="small"
-      data-testid="hover-button"
-      data-variant="invisible"
-      title="Hover Button"
-      type="button"
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      <svg
-        aria-hidden="true"
-        class="octicon octicon-mark-github"
-        display="inline-block"
-        fill="currentColor"
-        focusable="false"
-        height="16"
-        overflow="visible"
-        style="vertical-align: text-bottom;"
-        viewBox="0 0 16 16"
-        width="16"
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <path
-          d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-        />
-      </svg>
-    </button>
+        <button
+          aria-describedby="_r_1_-loading-announcement"
+          aria-label="Hover Button"
+          class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+          data-component="IconButton"
+          data-loading="false"
+          data-no-visuals="true"
+          data-size="small"
+          data-testid="hover-button"
+          data-variant="invisible"
+          title="Hover Button"
+          type="button"
+        >
+          <svg
+            aria-hidden="true"
+            class="octicon octicon-mark-github"
+            display="inline-block"
+            fill="currentColor"
+            focusable="false"
+            height="16"
+            overflow="visible"
+            style="vertical-align: text-bottom;"
+            viewBox="0 0 16 16"
+            width="16"
+          >
+            <path
+              d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+            />
+          </svg>
+        </button>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap
index 9b64288f0..1fcf38d90 100644
--- a/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/HoverGroup.test.tsx.snap
@@ -6,29 +6,51 @@ exports[`renderer/components/primitives/HoverGroup.tsx should render 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="none"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
-        Hover Group
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <div
+            class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="none"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+          >
+            Hover Group
+          </div>
+        </div>
       </div>
     </div>
   </body>,
   "container": <div>
     <div
-      class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="horizontal"
-      data-gap="none"
-      data-justify="start"
-      data-padding="none"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
-      Hover Group
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="absolute inset-y-0 right-0 pr-1 opacity-0 transition-opacity group-hover:opacity-100 group-hover:bg-gitify-repository prc-Stack-Stack-WJVsK"
+          data-align="center"
+          data-direction="horizontal"
+          data-gap="none"
+          data-justify="start"
+          data-padding="none"
+          data-wrap="nowrap"
+        >
+          Hover Group
+        </div>
+      </div>
     </div>
   </div>,
   "debug": [Function],
diff --git a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
index 6eb907e2d..69ed7dc05 100644
--- a/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
+++ b/src/renderer/components/primitives/__snapshots__/Title.test.tsx.snap
@@ -2,86 +2,108 @@
 
 exports[`renderer/routes/components/primitives/Title.tsx should render the title - default size 1`] = `
 <div>
-  <legend>
+  <div
+    data-color-mode="light"
+    data-dark-theme="dark"
+    data-light-theme="light"
+  >
     <div
-      class="mb-2"
+      class="prc-src-BaseStyles-dl-St"
+      data-portal-root="true"
     >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-        id="title-legend"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-person-fill"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
+      <legend>
+        <div
+          class="mb-2"
         >
-          <path
-            d="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
-          />
-        </svg>
-        <h4
-          class="prc-Heading-Heading-6CmGO"
-        >
-          Legend
-        </h4>
-      </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-legend"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-person-fill"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
+              />
+            </svg>
+            <h4
+              class="prc-Heading-Heading-6CmGO"
+            >
+              Legend
+            </h4>
+          </div>
+        </div>
+      </legend>
     </div>
-  </legend>
+  </div>
 </div>
 `;
 
 exports[`renderer/routes/components/primitives/Title.tsx should render the title - specific size 1`] = `
 <div>
-  <legend>
+  <div
+    data-color-mode="light"
+    data-dark-theme="dark"
+    data-light-theme="light"
+  >
     <div
-      class="mb-2"
+      class="prc-src-BaseStyles-dl-St"
+      data-portal-root="true"
     >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="horizontal"
-        data-gap="condensed"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-        id="title-legend"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-person-fill"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
-        >
-          <path
-            d="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
-          />
-        </svg>
-        <h4
-          class="prc-Heading-Heading-6CmGO"
+      <legend>
+        <div
+          class="mb-2"
         >
-          Legend
-        </h4>
-      </div>
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="horizontal"
+            data-gap="condensed"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
+            id="title-legend"
+          >
+            <svg
+              aria-hidden="true"
+              class="octicon octicon-person-fill"
+              display="inline-block"
+              fill="currentColor"
+              focusable="false"
+              height="16"
+              overflow="visible"
+              style="vertical-align: text-bottom;"
+              viewBox="0 0 16 16"
+              width="16"
+            >
+              <path
+                d="M4.243 4.757a3.757 3.757 0 1 1 5.851 3.119 6.006 6.006 0 0 1 3.9 5.339.75.75 0 0 1-.715.784H2.721a.75.75 0 0 1-.714-.784 6.006 6.006 0 0 1 3.9-5.34 3.753 3.753 0 0 1-1.664-3.118Z"
+              />
+            </svg>
+            <h4
+              class="prc-Heading-Heading-6CmGO"
+            >
+              Legend
+            </h4>
+          </div>
+        </div>
+      </legend>
     </div>
-  </legend>
+  </div>
 </div>
 `;
diff --git a/src/renderer/components/settings/AppearanceSettings.test.tsx b/src/renderer/components/settings/AppearanceSettings.test.tsx
index 9aa4eacd7..1491bb5f4 100644
--- a/src/renderer/components/settings/AppearanceSettings.test.tsx
+++ b/src/renderer/components/settings/AppearanceSettings.test.tsx
@@ -1,16 +1,12 @@
-import { act, fireEvent, render, screen } from '@testing-library/react';
+import { act, fireEvent, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import {
-  mockAuth,
-  mockGitHubAppAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { mockGitHubAppAccount } from '../../__mocks__/account-mocks';
 import { AppearanceSettings } from './AppearanceSettings';
 
 describe('renderer/components/settings/AppearanceSettings.tsx', () => {
-  const updateSetting = jest.fn();
+  const mockUpdateSetting = jest.fn();
   const zoomTimeout = () => new Promise((r) => setTimeout(r, 300));
 
   afterEach(() => {
@@ -19,17 +15,9 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
 
   it('should change the theme mode dropdown', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <AppearanceSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<AppearanceSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.selectOptions(
@@ -37,55 +25,40 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
       'LIGHT',
     );
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('theme', 'LIGHT');
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('theme', 'LIGHT');
   });
 
   it('should toggle increase contrast checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: {
-              accounts: [mockGitHubAppAccount],
-            },
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <AppearanceSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<AppearanceSettings />, {
+        auth: {
+          accounts: [mockGitHubAppAccount],
+        },
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-increaseContrast'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('increaseContrast', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('increaseContrast', true);
   });
 
   it('should update the zoom value when using CMD + and CMD -', async () => {
     window.gitify.zoom.getLevel = jest.fn().mockReturnValue(-1);
 
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <AppearanceSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<AppearanceSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     fireEvent(window, new Event('resize'));
     await zoomTimeout();
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('zoomPercentage', 50);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('zoomPercentage', 50);
   });
 
   it('should update the zoom values when using the zoom buttons', async () => {
@@ -96,17 +69,9 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
     });
 
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <AppearanceSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<AppearanceSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     // Zoom Out
@@ -114,16 +79,20 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
       await userEvent.click(screen.getByTestId('settings-zoom-out'));
       await zoomTimeout();
 
-      expect(updateSetting).toHaveBeenCalledTimes(1);
-      expect(updateSetting).toHaveBeenCalledWith('zoomPercentage', 90);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+      expect(mockUpdateSetting).toHaveBeenCalledWith('zoomPercentage', 90);
     });
 
     await act(async () => {
       await userEvent.click(screen.getByTestId('settings-zoom-out'));
       await zoomTimeout();
 
-      expect(updateSetting).toHaveBeenCalledTimes(2);
-      expect(updateSetting).toHaveBeenNthCalledWith(2, 'zoomPercentage', 80);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(2);
+      expect(mockUpdateSetting).toHaveBeenNthCalledWith(
+        2,
+        'zoomPercentage',
+        80,
+      );
     });
 
     // Zoom In
@@ -131,8 +100,12 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
       await userEvent.click(screen.getByTestId('settings-zoom-in'));
       await zoomTimeout();
 
-      expect(updateSetting).toHaveBeenCalledTimes(3);
-      expect(updateSetting).toHaveBeenNthCalledWith(3, 'zoomPercentage', 90);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(3);
+      expect(mockUpdateSetting).toHaveBeenNthCalledWith(
+        3,
+        'zoomPercentage',
+        90,
+      );
     });
 
     // Zoom Reset
@@ -140,54 +113,47 @@ describe('renderer/components/settings/AppearanceSettings.tsx', () => {
       await userEvent.click(screen.getByTestId('settings-zoom-reset'));
       await zoomTimeout();
 
-      expect(updateSetting).toHaveBeenCalledTimes(4);
-      expect(updateSetting).toHaveBeenNthCalledWith(4, 'zoomPercentage', 100);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(4);
+      expect(mockUpdateSetting).toHaveBeenNthCalledWith(
+        4,
+        'zoomPercentage',
+        100,
+      );
     });
   });
 
   it('should toggle account header checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: {
-              accounts: [mockGitHubAppAccount],
-            },
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <AppearanceSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<AppearanceSettings />, {
+        auth: {
+          accounts: [mockGitHubAppAccount],
+        },
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-showAccountHeader'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('showAccountHeader', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('showAccountHeader', true);
   });
 
   it('should toggle wrap notification title checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: {
-              accounts: [mockGitHubAppAccount],
-            },
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <AppearanceSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<AppearanceSettings />, {
+        auth: {
+          accounts: [mockGitHubAppAccount],
+        },
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-wrapNotificationTitle'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('wrapNotificationTitle', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'wrapNotificationTitle',
+      true,
+    );
   });
 });
diff --git a/src/renderer/components/settings/NotificationSettings.test.tsx b/src/renderer/components/settings/NotificationSettings.test.tsx
index e7e8a1ba3..bf0463b7a 100644
--- a/src/renderer/components/settings/NotificationSettings.test.tsx
+++ b/src/renderer/components/settings/NotificationSettings.test.tsx
@@ -1,16 +1,14 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { BaseStyles, ThemeProvider } from '@primer/react';
-
-import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import { Constants } from '../../constants';
-import { AppContext } from '../../context/App';
 import * as comms from '../../utils/comms';
 import { NotificationSettings } from './NotificationSettings';
 
 describe('renderer/components/settings/NotificationSettings.tsx', () => {
-  const updateSetting = jest.fn();
+  const mockUpdateSetting = jest.fn();
 
   afterEach(() => {
     jest.clearAllMocks();
@@ -18,60 +16,36 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
   it('should change the groupBy radio group', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('radio-groupBy-date'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('groupBy', 'DATE');
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('groupBy', 'DATE');
   });
 
   it('should change the fetchType radio group', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('radio-fetchType-inactivity'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('fetchType', 'INACTIVITY');
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('fetchType', 'INACTIVITY');
   });
 
   describe('fetch interval settings', () => {
     it('should update the fetch interval values when using the buttons', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: mockSettings,
-              updateSetting,
-            }}
-          >
-            <NotificationSettings />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<NotificationSettings />, {
+          updateSetting: mockUpdateSetting,
+        });
       });
 
       // Increase fetch interval
@@ -80,8 +54,8 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-increase'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(1);
-        expect(updateSetting).toHaveBeenCalledWith('fetchInterval', 120000);
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSetting).toHaveBeenCalledWith('fetchInterval', 120000);
       });
 
       await act(async () => {
@@ -89,8 +63,8 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-increase'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(2);
-        expect(updateSetting).toHaveBeenNthCalledWith(
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(2);
+        expect(mockUpdateSetting).toHaveBeenNthCalledWith(
           2,
           'fetchInterval',
           180000,
@@ -103,8 +77,8 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-decrease'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(3);
-        expect(updateSetting).toHaveBeenNthCalledWith(
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(3);
+        expect(mockUpdateSetting).toHaveBeenNthCalledWith(
           3,
           'fetchInterval',
           120000,
@@ -117,8 +91,8 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-reset'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(4);
-        expect(updateSetting).toHaveBeenNthCalledWith(
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(4);
+        expect(mockUpdateSetting).toHaveBeenNthCalledWith(
           4,
           'fetchInterval',
           60000,
@@ -128,22 +102,15 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
 
     it('should prevent going lower than minimum interval', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: {
-                ...mockSettings,
-                fetchInterval:
-                  Constants.MIN_FETCH_NOTIFICATIONS_INTERVAL_MS +
-                  Constants.FETCH_NOTIFICATIONS_INTERVAL_STEP_MS,
-              },
-              updateSetting,
-            }}
-          >
-            <NotificationSettings />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<NotificationSettings />, {
+          settings: {
+            ...mockSettings,
+            fetchInterval:
+              Constants.MIN_FETCH_NOTIFICATIONS_INTERVAL_MS +
+              Constants.FETCH_NOTIFICATIONS_INTERVAL_STEP_MS,
+          },
+          updateSetting: mockUpdateSetting,
+        });
       });
 
       await act(async () => {
@@ -151,8 +118,8 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-decrease'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(1);
-        expect(updateSetting).toHaveBeenNthCalledWith(
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSetting).toHaveBeenNthCalledWith(
           1,
           'fetchInterval',
           60000,
@@ -165,28 +132,21 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-decrease'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
       });
     });
 
     it('should prevent going above maximum interval', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: {
-                ...mockSettings,
-                fetchInterval:
-                  Constants.MAX_FETCH_NOTIFICATIONS_INTERVAL_MS -
-                  Constants.FETCH_NOTIFICATIONS_INTERVAL_STEP_MS,
-              },
-              updateSetting,
-            }}
-          >
-            <NotificationSettings />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<NotificationSettings />, {
+          settings: {
+            ...mockSettings,
+            fetchInterval:
+              Constants.MAX_FETCH_NOTIFICATIONS_INTERVAL_MS -
+              Constants.FETCH_NOTIFICATIONS_INTERVAL_STEP_MS,
+          },
+          updateSetting: mockUpdateSetting,
+        });
       });
 
       await act(async () => {
@@ -194,8 +154,8 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-increase'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(1);
-        expect(updateSetting).toHaveBeenNthCalledWith(
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSetting).toHaveBeenNthCalledWith(
           1,
           'fetchInterval',
           3600000,
@@ -208,137 +168,91 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
           screen.getByTestId('settings-fetch-interval-increase'),
         );
 
-        expect(updateSetting).toHaveBeenCalledTimes(1);
+        expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
       });
     });
   });
 
   it('should toggle the fetchAllNotifications checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-fetchAllNotifications'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('fetchAllNotifications', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'fetchAllNotifications',
+      false,
+    );
   });
 
   it('should toggle detailed notifications checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-detailedNotifications'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('detailedNotifications', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'detailedNotifications',
+      false,
+    );
   });
 
   it('should toggle metric pills checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-showPills'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('showPills', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('showPills', false);
   });
 
   it('should toggle show number checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-showNumber'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('showNumber', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('showNumber', false);
   });
 
   it('should toggle the showOnlyParticipating checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-showOnlyParticipating'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('participating', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('participating', true);
   });
 
   it('should open official docs for showOnlyParticipating tooltip', async () => {
-    const openExternalLinkMock = jest
+    const mockOpenExternalLink = jest
       .spyOn(comms, 'openExternalLink')
       .mockImplementation();
 
     await act(async () => {
-      render(
-        <ThemeProvider>
-          <BaseStyles>
-            <AppContext.Provider
-              value={{
-                auth: mockAuth,
-                settings: mockSettings,
-                updateSetting,
-              }}
-            >
-              <NotificationSettings />
-            </AppContext.Provider>
-          </BaseStyles>
-        </ThemeProvider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     const tooltipElement = screen.getByLabelText(
@@ -352,76 +266,58 @@ describe('renderer/components/settings/NotificationSettings.tsx', () => {
       ),
     );
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://docs.github.com/en/account-and-profile/managing-subscriptions-and-notifications-on-github/setting-up-notifications/configuring-notifications#about-participating-and-watching-notifications',
     );
   });
 
   it('should toggle the markAsDoneOnOpen checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-markAsDoneOnOpen'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('markAsDoneOnOpen', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('markAsDoneOnOpen', true);
   });
 
   it('should toggle the markAsDoneOnUnsubscribe checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(
       screen.getByTestId('checkbox-markAsDoneOnUnsubscribe'),
     );
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('markAsDoneOnUnsubscribe', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'markAsDoneOnUnsubscribe',
+      true,
+    );
   });
 
   it('should toggle the delayNotificationState checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <NotificationSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<NotificationSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(
       screen.getByTestId('checkbox-delayNotificationState'),
     );
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('delayNotificationState', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'delayNotificationState',
+      true,
+    );
   });
 });
diff --git a/src/renderer/components/settings/SettingsFooter.test.tsx b/src/renderer/components/settings/SettingsFooter.test.tsx
index 4fec2ae51..f7438c8eb 100644
--- a/src/renderer/components/settings/SettingsFooter.test.tsx
+++ b/src/renderer/components/settings/SettingsFooter.test.tsx
@@ -1,8 +1,7 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import * as comms from '../../utils/comms';
 import { SettingsFooter } from './SettingsFooter';
 
@@ -27,59 +26,32 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
 
   it('should show app version', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <SettingsFooter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsFooter />);
     });
 
     expect(screen.getByTestId('settings-release-notes')).toMatchSnapshot();
   });
 
   it('should open release notes', async () => {
-    const openExternalLinkMock = jest
+    const mockOpenExternalLink = jest
       .spyOn(comms, 'openExternalLink')
       .mockImplementation();
 
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <SettingsFooter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsFooter />);
     });
 
     await userEvent.click(screen.getByTestId('settings-release-notes'));
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/gitify-app/gitify/releases/tag/v0.0.1',
     );
   });
 
   it('should open account management', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <SettingsFooter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsFooter />);
     });
 
     await userEvent.click(screen.getByTestId('settings-accounts'));
@@ -88,23 +60,14 @@ describe('renderer/components/settings/SettingsFooter.tsx', () => {
   });
 
   it('should quit the app', async () => {
-    const quitAppMock = jest.spyOn(comms, 'quitApp');
+    const mockQuitApp = jest.spyOn(comms, 'quitApp');
 
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-          }}
-        >
-          <SettingsFooter />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsFooter />);
     });
 
     await userEvent.click(screen.getByTestId('settings-quit'));
 
-    expect(quitAppMock).toHaveBeenCalledTimes(1);
+    expect(mockQuitApp).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/renderer/components/settings/SettingsReset.test.tsx b/src/renderer/components/settings/SettingsReset.test.tsx
index ef058dc2b..daa7770f2 100644
--- a/src/renderer/components/settings/SettingsReset.test.tsx
+++ b/src/renderer/components/settings/SettingsReset.test.tsx
@@ -1,60 +1,43 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { SettingsReset } from './SettingsReset';
 
 describe('renderer/components/settings/SettingsReset.tsx', () => {
-  const resetSettings = jest.fn();
+  const mockResetSettings = jest.fn();
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
   it('should reset default settings when `OK`', async () => {
-    window.confirm = jest.fn(() => true); // always click 'OK'
+    globalThis.confirm = jest.fn(() => true); // always click 'OK'
 
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            resetSettings,
-          }}
-        >
-          <SettingsReset />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsReset />, {
+        resetSettings: mockResetSettings,
+      });
     });
 
     await userEvent.click(screen.getByTestId('settings-reset'));
     await userEvent.click(screen.getByText('Reset'));
 
-    expect(resetSettings).toHaveBeenCalled();
+    expect(mockResetSettings).toHaveBeenCalled();
   });
 
   it('should skip reset default settings when `cancelled`', async () => {
-    window.confirm = jest.fn(() => false); // always click 'cancel'
+    globalThis.confirm = jest.fn(() => false); // always click 'cancel'
 
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            resetSettings,
-          }}
-        >
-          <SettingsReset />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsReset />, {
+        resetSettings: mockResetSettings,
+      });
     });
 
     await userEvent.click(screen.getByTestId('settings-reset'));
     await userEvent.click(screen.getByText('Cancel'));
 
-    expect(resetSettings).not.toHaveBeenCalled();
+    expect(mockResetSettings).not.toHaveBeenCalled();
   });
 });
diff --git a/src/renderer/components/settings/SystemSettings.test.tsx b/src/renderer/components/settings/SystemSettings.test.tsx
index 23f4dce74..ba7933640 100644
--- a/src/renderer/components/settings/SystemSettings.test.tsx
+++ b/src/renderer/components/settings/SystemSettings.test.tsx
@@ -1,13 +1,13 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import type { Percentage } from '../../types';
 import { SystemSettings } from './SystemSettings';
 
 describe('renderer/components/settings/SystemSettings.tsx', () => {
-  const updateSetting = jest.fn();
+  const mockUpdateSetting = jest.fn();
 
   afterEach(() => {
     jest.clearAllMocks();
@@ -15,181 +15,100 @@ describe('renderer/components/settings/SystemSettings.tsx', () => {
 
   it('should change the open links radio group', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('radio-openLinks-background'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('openLinks', 'BACKGROUND');
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('openLinks', 'BACKGROUND');
   });
 
   it('should toggle the keyboardShortcut checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-keyboardShortcut'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('keyboardShortcut', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('keyboardShortcut', false);
   });
 
   it('should toggle the showNotifications checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-showNotifications'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('showNotifications', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('showNotifications', false);
   });
 
   describe('playSound', () => {
     it('should toggle the playSound checkbox', async () => {
-      const { rerender } = render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
 
       await userEvent.click(screen.getByTestId('checkbox-playSound'));
 
-      expect(updateSetting).toHaveBeenCalledTimes(1);
-      expect(updateSetting).toHaveBeenCalledWith('playSound', false);
-
-      // Simulate update to context with playSound = false
-      rerender(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: { ...mockSettings, playSound: false },
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
-
-      expect(screen.getByTestId('settings-volume-group')).not.toBeVisible();
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+      expect(mockUpdateSetting).toHaveBeenCalledWith('playSound', false);
     });
 
     it('should increase notification volume', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
 
       await userEvent.click(screen.getByTestId('settings-volume-up'));
 
-      expect(updateSetting).toHaveBeenCalledTimes(1);
-      expect(updateSetting).toHaveBeenCalledWith('notificationVolume', 30);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+      expect(mockUpdateSetting).toHaveBeenCalledWith('notificationVolume', 30);
     });
 
     it('should decrease notification volume', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
 
       await userEvent.click(screen.getByTestId('settings-volume-down'));
 
-      expect(updateSetting).toHaveBeenCalledTimes(1);
-      expect(updateSetting).toHaveBeenCalledWith('notificationVolume', 10);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+      expect(mockUpdateSetting).toHaveBeenCalledWith('notificationVolume', 10);
     });
 
     it('should reset notification volume', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: {
-              ...mockSettings,
-              notificationVolume: 30 as Percentage,
-            },
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        settings: { ...mockSettings, notificationVolume: 30 as Percentage },
+        updateSetting: mockUpdateSetting,
+      });
 
       await userEvent.click(screen.getByTestId('settings-volume-reset'));
 
-      expect(updateSetting).toHaveBeenCalledTimes(1);
-      expect(updateSetting).toHaveBeenCalledWith('notificationVolume', 20);
+      expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+      expect(mockUpdateSetting).toHaveBeenCalledWith('notificationVolume', 20);
     });
   });
 
   it('should toggle the openAtStartup checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <SystemSettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SystemSettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-openAtStartup'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('openAtStartup', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith('openAtStartup', true);
   });
 });
diff --git a/src/renderer/components/settings/TraySettings.test.tsx b/src/renderer/components/settings/TraySettings.test.tsx
index 98737b2cd..422cffd18 100644
--- a/src/renderer/components/settings/TraySettings.test.tsx
+++ b/src/renderer/components/settings/TraySettings.test.tsx
@@ -1,12 +1,11 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { mockAuth, mockSettings } from '../../__mocks__/state-mocks';
-import { AppContext } from '../../context/App';
+import { renderWithAppContext } from '../../__helpers__/test-utils';
 import { TraySettings } from './TraySettings';
 
 describe('renderer/components/settings/TraySettings.tsx', () => {
-  const updateSetting = jest.fn();
+  const mockUpdateSetting = jest.fn();
 
   afterEach(() => {
     jest.clearAllMocks();
@@ -14,25 +13,17 @@ describe('renderer/components/settings/TraySettings.tsx', () => {
 
   it('should toggle the showNotificationsCountInTray checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <TraySettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<TraySettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(
       screen.getByTestId('checkbox-showNotificationsCountInTray'),
     );
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith(
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
       'showNotificationsCountInTray',
       false,
     );
@@ -40,43 +31,33 @@ describe('renderer/components/settings/TraySettings.tsx', () => {
 
   it('should toggle the useUnreadActiveIcon checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <TraySettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<TraySettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-useUnreadActiveIcon'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('useUnreadActiveIcon', false);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'useUnreadActiveIcon',
+      false,
+    );
   });
 
   it('should toggle the useAlternateIdleIcon checkbox', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            updateSetting,
-          }}
-        >
-          <TraySettings />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<TraySettings />, {
+        updateSetting: mockUpdateSetting,
+      });
     });
 
     await userEvent.click(screen.getByTestId('checkbox-useAlternateIdleIcon'));
 
-    expect(updateSetting).toHaveBeenCalledTimes(1);
-    expect(updateSetting).toHaveBeenCalledWith('useAlternateIdleIcon', true);
+    expect(mockUpdateSetting).toHaveBeenCalledTimes(1);
+    expect(mockUpdateSetting).toHaveBeenCalledWith(
+      'useAlternateIdleIcon',
+      true,
+    );
   });
 });
diff --git a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
index 3e4b49a6e..a02b0f6ca 100644
--- a/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
+++ b/src/renderer/components/settings/__snapshots__/SettingsFooter.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`renderer/components/settings/SettingsFooter.tsx should show app version 1`] = `
 <button
-  aria-describedby="_r_1_-loading-announcement _r_0_"
+  aria-describedby="_r_2_-loading-announcement _r_1_"
   class="prc-Button-ButtonBase-c50BI"
   data-loading="false"
   data-no-visuals="true"
diff --git a/src/renderer/context/App.test.tsx b/src/renderer/context/App.test.tsx
index e867b38bb..d8270aa9a 100644
--- a/src/renderer/context/App.test.tsx
+++ b/src/renderer/context/App.test.tsx
@@ -1,7 +1,8 @@
-import { act, fireEvent, render, waitFor } from '@testing-library/react';
+import { act, fireEvent, waitFor } from '@testing-library/react';
 import { useContext } from 'react';
 
-import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
+import { renderWithAppContext } from '../__helpers__/test-utils';
+import { mockSettings } from '../__mocks__/state-mocks';
 import { Constants } from '../constants';
 import { useNotifications } from '../hooks/useNotifications';
 import type { AuthState, Hostname, SettingsState, Token } from '../types';
@@ -16,18 +17,6 @@ import { defaultSettings } from './defaults';
 
 jest.mock('../hooks/useNotifications');
 
-const customRender = (
-  ui,
-  auth: AuthState = mockAuth,
-  settings: SettingsState = mockSettings,
-) => {
-  return render(
-    <AppContext.Provider value={{ auth, settings }}>
-      <AppProvider>{ui}</AppProvider>
-    </AppContext.Provider>,
-  );
-};
-
 describe('renderer/context/App.tsx', () => {
   beforeEach(() => {
     jest.useFakeTimers();
@@ -39,7 +28,7 @@ describe('renderer/context/App.tsx', () => {
   });
 
   describe('notification methods', () => {
-    const setTrayIconColorAndTitleMock = jest
+    const mockSetTrayIconColorAndTitle = jest
       .spyOn(tray, 'setTrayIconColorAndTitle')
       .mockImplementation(jest.fn());
 
@@ -51,10 +40,10 @@ describe('renderer/context/App.tsx', () => {
       .spyOn(notifications, 'getUnreadNotificationCount')
       .mockImplementation(jest.fn());
 
-    const fetchNotificationsMock = jest.fn();
-    const markNotificationsAsReadMock = jest.fn();
-    const markNotificationsAsDoneMock = jest.fn();
-    const unsubscribeNotificationMock = jest.fn();
+    const mockFetchNotifications = jest.fn();
+    const mockMarkNotificationsAsRead = jest.fn();
+    const mockMarkNotificationsAsDone = jest.fn();
+    const mockUnsubscribeNotification = jest.fn();
 
     const mockDefaultState = {
       auth: { accounts: [] },
@@ -63,10 +52,10 @@ describe('renderer/context/App.tsx', () => {
 
     beforeEach(() => {
       (useNotifications as jest.Mock).mockReturnValue({
-        fetchNotifications: fetchNotificationsMock,
-        markNotificationsAsRead: markNotificationsAsReadMock,
-        markNotificationsAsDone: markNotificationsAsDoneMock,
-        unsubscribeNotification: unsubscribeNotificationMock,
+        fetchNotifications: mockFetchNotifications,
+        markNotificationsAsRead: mockMarkNotificationsAsRead,
+        markNotificationsAsDone: mockMarkNotificationsAsDone,
+        unsubscribeNotification: mockUnsubscribeNotification,
       });
     });
 
@@ -75,10 +64,10 @@ describe('renderer/context/App.tsx', () => {
     });
 
     it('fetch notifications every minute', async () => {
-      customRender(null);
+      renderWithAppContext(<AppProvider>{null}</AppProvider>);
 
       await waitFor(() =>
-        expect(fetchNotificationsMock).toHaveBeenCalledTimes(1),
+        expect(mockFetchNotifications).toHaveBeenCalledTimes(1),
       );
 
       act(() => {
@@ -86,21 +75,21 @@ describe('renderer/context/App.tsx', () => {
           Constants.DEFAULT_FETCH_NOTIFICATIONS_INTERVAL_MS,
         );
       });
-      expect(fetchNotificationsMock).toHaveBeenCalledTimes(2);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(2);
 
       act(() => {
         jest.advanceTimersByTime(
           Constants.DEFAULT_FETCH_NOTIFICATIONS_INTERVAL_MS,
         );
       });
-      expect(fetchNotificationsMock).toHaveBeenCalledTimes(3);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(3);
 
       act(() => {
         jest.advanceTimersByTime(
           Constants.DEFAULT_FETCH_NOTIFICATIONS_INTERVAL_MS,
         );
       });
-      expect(fetchNotificationsMock).toHaveBeenCalledTimes(4);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(4);
     });
 
     it('should call fetchNotifications', async () => {
@@ -114,13 +103,17 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
-      fetchNotificationsMock.mockReset();
+      mockFetchNotifications.mockReset();
 
       fireEvent.click(getByText('Test Case'));
 
-      expect(fetchNotificationsMock).toHaveBeenCalledTimes(1);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(1);
     });
 
     it('should call markNotificationsAsRead', async () => {
@@ -137,16 +130,20 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       fireEvent.click(getByText('Test Case'));
 
-      expect(markNotificationsAsReadMock).toHaveBeenCalledTimes(1);
-      expect(markNotificationsAsReadMock).toHaveBeenCalledWith(
+      expect(mockMarkNotificationsAsRead).toHaveBeenCalledTimes(1);
+      expect(mockMarkNotificationsAsRead).toHaveBeenCalledWith(
         mockDefaultState,
         [mockSingleNotification],
       );
-      expect(setTrayIconColorAndTitleMock).toHaveBeenCalledTimes(1);
+      expect(mockSetTrayIconColorAndTitle).toHaveBeenCalledTimes(1);
     });
 
     it('should call markNotificationsAsDone', async () => {
@@ -163,16 +160,20 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       fireEvent.click(getByText('Test Case'));
 
-      expect(markNotificationsAsDoneMock).toHaveBeenCalledTimes(1);
-      expect(markNotificationsAsDoneMock).toHaveBeenCalledWith(
+      expect(mockMarkNotificationsAsDone).toHaveBeenCalledTimes(1);
+      expect(mockMarkNotificationsAsDone).toHaveBeenCalledWith(
         mockDefaultState,
         [mockSingleNotification],
       );
-      expect(setTrayIconColorAndTitleMock).toHaveBeenCalledTimes(1);
+      expect(mockSetTrayIconColorAndTitle).toHaveBeenCalledTimes(1);
     });
 
     it('should call unsubscribeNotification', async () => {
@@ -189,26 +190,30 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       fireEvent.click(getByText('Test Case'));
 
-      expect(unsubscribeNotificationMock).toHaveBeenCalledTimes(1);
-      expect(unsubscribeNotificationMock).toHaveBeenCalledWith(
+      expect(mockUnsubscribeNotification).toHaveBeenCalledTimes(1);
+      expect(mockUnsubscribeNotification).toHaveBeenCalledWith(
         mockDefaultState,
         mockSingleNotification,
       );
-      expect(setTrayIconColorAndTitleMock).toHaveBeenCalledTimes(1);
+      expect(mockSetTrayIconColorAndTitle).toHaveBeenCalledTimes(1);
     });
   });
 
   describe('authentication methods', () => {
-    const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
-    const fetchNotificationsMock = jest.fn();
+    const mockApiRequestAuth = jest.spyOn(apiRequests, 'apiRequestAuth');
+    const mockFetchNotifications = jest.fn();
 
     beforeEach(() => {
       (useNotifications as jest.Mock).mockReturnValue({
-        fetchNotifications: fetchNotificationsMock,
+        fetchNotifications: mockFetchNotifications,
       });
     });
 
@@ -217,7 +222,7 @@ describe('renderer/context/App.tsx', () => {
     });
 
     it('should call loginWithPersonalAccessToken', async () => {
-      apiRequestAuthMock.mockResolvedValueOnce(null);
+      mockApiRequestAuth.mockResolvedValueOnce(null);
 
       const TestComponent = () => {
         const { loginWithPersonalAccessToken } = useContext(AppContext);
@@ -237,16 +242,20 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       fireEvent.click(getByText('Test Case'));
 
       await waitFor(() =>
-        expect(fetchNotificationsMock).toHaveBeenCalledTimes(1),
+        expect(mockFetchNotifications).toHaveBeenCalledTimes(1),
       );
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
-      expect(apiRequestAuthMock).toHaveBeenCalledWith(
+      expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
+      expect(mockApiRequestAuth).toHaveBeenCalledWith(
         'https://api.github.com/notifications',
         'HEAD',
         'encrypted',
@@ -255,16 +264,16 @@ describe('renderer/context/App.tsx', () => {
   });
 
   describe('settings methods', () => {
-    const fetchNotificationsMock = jest.fn();
+    const mockFetchNotifications = jest.fn();
 
     beforeEach(() => {
       (useNotifications as jest.Mock).mockReturnValue({
-        fetchNotifications: fetchNotificationsMock,
+        fetchNotifications: mockFetchNotifications,
       });
     });
 
     it('should call updateSetting', async () => {
-      const saveStateMock = jest
+      const mockSaveState = jest
         .spyOn(storage, 'saveState')
         .mockImplementation(jest.fn());
 
@@ -281,13 +290,17 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       act(() => {
         fireEvent.click(getByText('Test Case'));
       });
 
-      expect(saveStateMock).toHaveBeenCalledWith({
+      expect(mockSaveState).toHaveBeenCalledWith({
         auth: {
           accounts: [],
         } as AuthState,
@@ -299,8 +312,8 @@ describe('renderer/context/App.tsx', () => {
     });
 
     it('should call updateSetting and set auto launch(openAtStartup)', async () => {
-      const setAutoLaunchMock = jest.spyOn(comms, 'setAutoLaunch');
-      const saveStateMock = jest
+      const mockSetAutoLaunch = jest.spyOn(comms, 'setAutoLaunch');
+      const mockSaveState = jest
         .spyOn(storage, 'saveState')
         .mockImplementation(jest.fn());
 
@@ -317,15 +330,19 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       act(() => {
         fireEvent.click(getByText('Test Case'));
       });
 
-      expect(setAutoLaunchMock).toHaveBeenCalledWith(true);
+      expect(mockSetAutoLaunch).toHaveBeenCalledWith(true);
 
-      expect(saveStateMock).toHaveBeenCalledWith({
+      expect(mockSaveState).toHaveBeenCalledWith({
         auth: {
           accounts: [],
         } as AuthState,
@@ -337,7 +354,7 @@ describe('renderer/context/App.tsx', () => {
     });
 
     it('should clear filters back to default', async () => {
-      const saveStateMock = jest
+      const mockSaveState = jest
         .spyOn(storage, 'saveState')
         .mockImplementation(jest.fn());
 
@@ -351,13 +368,17 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       act(() => {
         fireEvent.click(getByText('Test Case'));
       });
 
-      expect(saveStateMock).toHaveBeenCalledWith({
+      expect(mockSaveState).toHaveBeenCalledWith({
         auth: {
           accounts: [],
         } as AuthState,
@@ -374,7 +395,7 @@ describe('renderer/context/App.tsx', () => {
     });
 
     it('should call resetSettings', async () => {
-      const saveStateMock = jest
+      const mockSaveState = jest
         .spyOn(storage, 'saveState')
         .mockImplementation(jest.fn());
 
@@ -388,13 +409,17 @@ describe('renderer/context/App.tsx', () => {
         );
       };
 
-      const { getByText } = customRender(<TestComponent />);
+      const { getByText } = renderWithAppContext(
+        <AppProvider>
+          <TestComponent />
+        </AppProvider>,
+      );
 
       act(() => {
         fireEvent.click(getByText('Test Case'));
       });
 
-      expect(saveStateMock).toHaveBeenCalledWith({
+      expect(mockSaveState).toHaveBeenCalledWith({
         auth: {
           accounts: [],
         } as AuthState,
diff --git a/src/renderer/context/App.tsx b/src/renderer/context/App.tsx
index 9310380c2..190f89e9f 100644
--- a/src/renderer/context/App.tsx
+++ b/src/renderer/context/App.tsx
@@ -63,7 +63,7 @@ import { setTrayIconColorAndTitle } from '../utils/tray';
 import { zoomPercentageToLevel } from '../utils/zoom';
 import { defaultAuth, defaultFilters, defaultSettings } from './defaults';
 
-interface AppContextState {
+export interface AppContextState {
   auth: AuthState;
   isLoggedIn: boolean;
   loginWithGitHubApp: () => Promise<void>;
diff --git a/src/renderer/hooks/useNotifications.test.ts b/src/renderer/hooks/useNotifications.test.ts
index b8226f1a3..9fc7b46de 100644
--- a/src/renderer/hooks/useNotifications.test.ts
+++ b/src/renderer/hooks/useNotifications.test.ts
@@ -3,12 +3,8 @@ import { act, renderHook, waitFor } from '@testing-library/react';
 import axios, { AxiosError } from 'axios';
 import nock from 'nock';
 
-import {
-  mockAuth,
-  mockGitHubCloudAccount,
-  mockSettings,
-  mockState,
-} from '../__mocks__/state-mocks';
+import { mockGitHubCloudAccount } from '../__mocks__/account-mocks';
+import { mockAuth, mockSettings, mockState } from '../__mocks__/state-mocks';
 import {
   mockNotificationUser,
   mockSingleNotification,
diff --git a/src/renderer/routes/Accounts.test.tsx b/src/renderer/routes/Accounts.test.tsx
index b465ef061..68cbb91f8 100644
--- a/src/renderer/routes/Accounts.test.tsx
+++ b/src/renderer/routes/Accounts.test.tsx
@@ -1,17 +1,13 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
+import { act, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { BaseStyles, ThemeProvider } from '@primer/react';
-
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import {
-  mockAuth,
   mockGitHubAppAccount,
   mockOAuthAccount,
   mockPersonalAccessTokenAccount,
-  mockSettings,
-} from '../__mocks__/state-mocks';
-import { AppContext } from '../context/App';
-import * as apiRequests from '../utils/api/request';
+} from '../__mocks__/account-mocks';
+import * as authUtils from '../utils/auth/utils';
 import * as comms from '../utils/comms';
 import * as links from '../utils/links';
 import * as storage from '../utils/storage';
@@ -31,39 +27,24 @@ describe('renderer/routes/Accounts.tsx', () => {
   describe('General', () => {
     it('should render itself & its children', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [
-                  mockPersonalAccessTokenAccount,
-                  mockOAuthAccount,
-                  mockGitHubAppAccount,
-                ],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: {
+            accounts: [
+              mockPersonalAccessTokenAccount,
+              mockOAuthAccount,
+              mockGitHubAppAccount,
+            ],
+          },
+        });
       });
 
-      expect(screen.getByTestId('accounts')).toMatchSnapshot();
+      expect(screen.getByTestId('accounts')).toBeInTheDocument();
+      expect(screen.getAllByTestId('account-profile')).toHaveLength(3);
     });
 
     it('should go back by pressing the icon', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />);
       });
 
       await userEvent.click(screen.getByTestId('header-nav-back'));
@@ -73,182 +54,123 @@ describe('renderer/routes/Accounts.tsx', () => {
   });
 
   describe('Account interactions', () => {
+    const mockOpenExternalLink = jest
+      .spyOn(comms, 'openExternalLink')
+      .mockImplementation();
+
     it('open profile in external browser', async () => {
-      const openAccountProfileMock = jest
+      const mockOpenAccountProfile = jest
         .spyOn(links, 'openAccountProfile')
         .mockImplementation();
 
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [mockPersonalAccessTokenAccount],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockPersonalAccessTokenAccount] },
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-profile'));
 
-      expect(openAccountProfileMock).toHaveBeenCalledTimes(1);
-      expect(openAccountProfileMock).toHaveBeenCalledWith(
+      expect(mockOpenAccountProfile).toHaveBeenCalledTimes(1);
+      expect(mockOpenAccountProfile).toHaveBeenCalledWith(
         mockPersonalAccessTokenAccount,
       );
     });
 
     it('open host in external browser', async () => {
-      const openExternalLinkMock = jest
-        .spyOn(comms, 'openExternalLink')
-        .mockImplementation();
-
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [mockPersonalAccessTokenAccount],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockPersonalAccessTokenAccount] },
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-host'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith('https://github.com');
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith('https://github.com');
     });
 
     it('open developer settings in external browser', async () => {
-      const openExternalLinkMock = jest
-        .spyOn(comms, 'openExternalLink')
-        .mockImplementation();
-
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [mockPersonalAccessTokenAccount],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockPersonalAccessTokenAccount] },
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-developer-settings'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/settings/tokens',
       );
     });
 
     it('should render with PAT scopes warning', async () => {
-      const openExternalLinkMock = jest
-        .spyOn(comms, 'openExternalLink')
-        .mockImplementation();
-
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [
-                  {
-                    ...mockPersonalAccessTokenAccount,
-                    hasRequiredScopes: false,
-                  },
-                  mockOAuthAccount,
-                  mockGitHubAppAccount,
-                ],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: {
+            accounts: [
+              { ...mockPersonalAccessTokenAccount, hasRequiredScopes: false },
+              mockOAuthAccount,
+              mockGitHubAppAccount,
+            ],
+          },
+        });
       });
 
-      expect(screen.getByTestId('accounts')).toMatchSnapshot();
+      expect(screen.getByTestId('accounts')).toBeInTheDocument();
+      // All 3 accounts render the warning button, but only 1 is visible
+      expect(screen.getAllByTestId('account-missing-scopes')).toHaveLength(3);
 
       await userEvent.click(screen.getAllByTestId('account-missing-scopes')[0]);
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/settings/tokens',
       );
     });
 
     it('should set account as primary account', async () => {
-      const saveStateMock = jest
+      const mockSaveState = jest
         .spyOn(storage, 'saveState')
         .mockImplementation();
 
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [
-                  mockPersonalAccessTokenAccount,
-                  mockOAuthAccount,
-                  mockGitHubAppAccount,
-                ],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: {
+            accounts: [
+              mockPersonalAccessTokenAccount,
+              mockOAuthAccount,
+              mockGitHubAppAccount,
+            ],
+          },
+        });
       });
 
-      expect(screen.getByTestId('accounts')).toMatchSnapshot();
+      expect(screen.getByTestId('accounts')).toBeInTheDocument();
+      // All 3 accounts render the primary/set-primary button
+      expect(screen.getAllByTestId('account-set-primary')).toHaveLength(3);
 
       await userEvent.click(screen.getAllByTestId('account-set-primary')[0]);
 
-      expect(saveStateMock).toHaveBeenCalled();
+      expect(mockSaveState).toHaveBeenCalled();
     });
 
     it('should refresh account', async () => {
-      const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
+      const mockRefreshAccount = jest
+        .spyOn(authUtils, 'refreshAccount')
+        .mockImplementation();
 
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [mockPersonalAccessTokenAccount],
-              },
-              settings: mockSettings,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockPersonalAccessTokenAccount] },
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-refresh'));
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
-      expect(apiRequestAuthMock).toHaveBeenCalledWith(
-        'https://api.github.com/user',
-        'GET',
-        'token-123-456',
-      );
+      expect(mockRefreshAccount).toHaveBeenCalledTimes(1);
+
       await waitFor(() =>
         expect(mockNavigate).toHaveBeenNthCalledWith(1, '/accounts', {
           replace: true,
@@ -257,27 +179,18 @@ describe('renderer/routes/Accounts.tsx', () => {
     });
 
     it('should logout', async () => {
-      const logoutFromAccountMock = jest.fn();
+      const mockLogoutFromAccount = jest.fn();
 
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: {
-                accounts: [mockPersonalAccessTokenAccount],
-              },
-              settings: mockSettings,
-              logoutFromAccount: logoutFromAccountMock,
-            }}
-          >
-            <AccountsRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockPersonalAccessTokenAccount] },
+          logoutFromAccount: mockLogoutFromAccount,
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-logout'));
 
-      expect(logoutFromAccountMock).toHaveBeenCalledTimes(1);
+      expect(mockLogoutFromAccount).toHaveBeenCalledTimes(1);
 
       expect(mockNavigate).toHaveBeenNthCalledWith(1, -1);
     });
@@ -288,21 +201,10 @@ describe('renderer/routes/Accounts.tsx', () => {
       const mockLoginWithGitHubApp = jest.fn();
 
       await act(async () => {
-        render(
-          <ThemeProvider>
-            <BaseStyles>
-              <AppContext.Provider
-                value={{
-                  auth: { accounts: [mockOAuthAccount] },
-                  settings: mockSettings,
-                  loginWithGitHubApp: mockLoginWithGitHubApp,
-                }}
-              >
-                <AccountsRoute />
-              </AppContext.Provider>
-            </BaseStyles>
-          </ThemeProvider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockOAuthAccount] },
+          loginWithGitHubApp: mockLoginWithGitHubApp,
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-add-new'));
@@ -313,20 +215,9 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should show login with personal access token', async () => {
       await act(async () => {
-        render(
-          <ThemeProvider>
-            <BaseStyles>
-              <AppContext.Provider
-                value={{
-                  auth: { accounts: [mockOAuthAccount] },
-                  settings: mockSettings,
-                }}
-              >
-                <AccountsRoute />
-              </AppContext.Provider>
-            </BaseStyles>
-          </ThemeProvider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockOAuthAccount] },
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-add-new'));
@@ -343,20 +234,9 @@ describe('renderer/routes/Accounts.tsx', () => {
 
     it('should show login with oauth app', async () => {
       await act(async () => {
-        render(
-          <ThemeProvider>
-            <BaseStyles>
-              <AppContext.Provider
-                value={{
-                  auth: { accounts: [mockPersonalAccessTokenAccount] },
-                  settings: mockSettings,
-                }}
-              >
-                <AccountsRoute />
-              </AppContext.Provider>
-            </BaseStyles>
-          </ThemeProvider>,
-        );
+        renderWithAppContext(<AccountsRoute />, {
+          auth: { accounts: [mockPersonalAccessTokenAccount] },
+        });
       });
 
       await userEvent.click(screen.getByTestId('account-add-new'));
diff --git a/src/renderer/routes/Filters.test.tsx b/src/renderer/routes/Filters.test.tsx
index 115c26d3e..1a5e0efe6 100644
--- a/src/renderer/routes/Filters.test.tsx
+++ b/src/renderer/routes/Filters.test.tsx
@@ -1,8 +1,7 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
-import { AppContext } from '../context/App';
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import { FiltersRoute } from './Filters';
 
 const mockNavigate = jest.fn();
@@ -12,8 +11,8 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('renderer/routes/Filters.tsx', () => {
-  const clearFilters = jest.fn();
-  const fetchNotifications = jest.fn();
+  const mockClearFilters = jest.fn();
+  const mockFetchNotifications = jest.fn();
 
   afterEach(() => {
     jest.clearAllMocks();
@@ -22,17 +21,7 @@ describe('renderer/routes/Filters.tsx', () => {
   describe('General', () => {
     it('should render itself & its children', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: mockSettings,
-              notifications: [],
-            }}
-          >
-            <FiltersRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<FiltersRoute />);
       });
 
       expect(screen.getByTestId('filters')).toMatchSnapshot();
@@ -40,23 +29,14 @@ describe('renderer/routes/Filters.tsx', () => {
 
     it('should go back by pressing the icon', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: mockSettings,
-              notifications: [],
-              fetchNotifications,
-            }}
-          >
-            <FiltersRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<FiltersRoute />, {
+          fetchNotifications: mockFetchNotifications,
+        });
       });
 
       await userEvent.click(screen.getByTestId('header-nav-back'));
 
-      expect(fetchNotifications).toHaveBeenCalledTimes(1);
+      expect(mockFetchNotifications).toHaveBeenCalledTimes(1);
       expect(mockNavigate).toHaveBeenNthCalledWith(1, -1);
     });
   });
@@ -64,23 +44,14 @@ describe('renderer/routes/Filters.tsx', () => {
   describe('Footer section', () => {
     it('should clear filters', async () => {
       await act(async () => {
-        render(
-          <AppContext.Provider
-            value={{
-              auth: mockAuth,
-              settings: mockSettings,
-              notifications: [],
-              clearFilters,
-            }}
-          >
-            <FiltersRoute />
-          </AppContext.Provider>,
-        );
+        renderWithAppContext(<FiltersRoute />, {
+          clearFilters: mockClearFilters,
+        });
       });
 
       await userEvent.click(screen.getByTestId('filters-clear'));
 
-      expect(clearFilters).toHaveBeenCalled();
+      expect(mockClearFilters).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/renderer/routes/Login.test.tsx b/src/renderer/routes/Login.test.tsx
index df3f75476..3fb3740c9 100644
--- a/src/renderer/routes/Login.test.tsx
+++ b/src/renderer/routes/Login.test.tsx
@@ -1,7 +1,7 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { AppContext } from '../context/App';
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import * as comms from '../utils/comms';
 import { LoginRoute } from './Login';
 
@@ -17,41 +17,30 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should render itself & its children', () => {
-    const tree = render(<LoginRoute />);
+    const tree = renderWithAppContext(<LoginRoute />, { isLoggedIn: false });
 
     expect(tree).toMatchSnapshot();
+
+    expect(mockNavigate).toHaveBeenCalledTimes(0);
   });
 
   it('should redirect to notifications once logged in', () => {
-    const showWindowMock = jest.spyOn(comms, 'showWindow');
-
-    const { rerender } = render(
-      <AppContext.Provider value={{ isLoggedIn: false }}>
-        <LoginRoute />
-      </AppContext.Provider>,
-    );
+    const mockShowWindow = jest.spyOn(comms, 'showWindow');
 
-    rerender(
-      <AppContext.Provider value={{ isLoggedIn: true }}>
-        <LoginRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginRoute />, {
+      isLoggedIn: true,
+    });
 
-    expect(showWindowMock).toHaveBeenCalledTimes(1);
+    expect(mockShowWindow).toHaveBeenCalledTimes(1);
     expect(mockNavigate).toHaveBeenNthCalledWith(1, '/', { replace: true });
   });
 
   it('should login with github', async () => {
     const mockLoginWithGitHubApp = jest.fn();
-    render(
-      <AppContext.Provider
-        value={{
-          loginWithGitHubApp: mockLoginWithGitHubApp,
-        }}
-      >
-        <LoginRoute />
-      </AppContext.Provider>,
-    );
+
+    renderWithAppContext(<LoginRoute />, {
+      loginWithGitHubApp: mockLoginWithGitHubApp,
+    });
 
     await userEvent.click(screen.getByTestId('login-github'));
 
@@ -59,7 +48,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with personal access token', async () => {
-    render(<LoginRoute />);
+    renderWithAppContext(<LoginRoute />);
 
     await userEvent.click(screen.getByTestId('login-pat'));
 
@@ -70,7 +59,7 @@ describe('renderer/routes/Login.tsx', () => {
   });
 
   it('should navigate to login with oauth app', async () => {
-    render(<LoginRoute />);
+    renderWithAppContext(<LoginRoute />);
 
     await userEvent.click(screen.getByTestId('login-oauth-app'));
 
diff --git a/src/renderer/routes/LoginWithOAuthApp.test.tsx b/src/renderer/routes/LoginWithOAuthApp.test.tsx
index 2feab48ee..601e62efb 100644
--- a/src/renderer/routes/LoginWithOAuthApp.test.tsx
+++ b/src/renderer/routes/LoginWithOAuthApp.test.tsx
@@ -1,8 +1,8 @@
-import { render, screen } from '@testing-library/react';
+import { screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { AppContext } from '../context/App';
-import type { AuthState, ClientID, ClientSecret, Hostname } from '../types';
+import { renderWithAppContext } from '../__helpers__/test-utils';
+import type { ClientID, ClientSecret, Hostname } from '../types';
 import * as comms from '../utils/comms';
 import { LoginWithOAuthAppRoute, validateForm } from './LoginWithOAuthApp';
 
@@ -15,34 +15,22 @@ jest.mock('react-router-dom', () => ({
 describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   const mockLoginWithOAuthApp = jest.fn();
 
-  const openExternalLinkMock = jest
+  const mockOpenExternalLink = jest
     .spyOn(comms, 'openExternalLink')
     .mockImplementation();
 
-  const mockAuth: AuthState = {
-    accounts: [],
-  };
-
   afterEach(() => {
     jest.clearAllMocks();
   });
 
   it('renders correctly', () => {
-    const tree = render(
-      <AppContext.Provider value={{ auth: mockAuth }}>
-        <LoginWithOAuthAppRoute />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<LoginWithOAuthAppRoute />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('let us go back', async () => {
-    render(
-      <AppContext.Provider value={{ auth: mockAuth }}>
-        <LoginWithOAuthAppRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithOAuthAppRoute />);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -78,25 +66,17 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
 
   describe("'Create new OAuth App' button", () => {
     it('should be disabled if no hostname configured', async () => {
-      render(
-        <AppContext.Provider value={{ auth: mockAuth }}>
-          <LoginWithOAuthAppRoute />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<LoginWithOAuthAppRoute />);
 
       await userEvent.clear(screen.getByTestId('login-hostname'));
 
       await userEvent.click(screen.getByTestId('login-create-oauth-app'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(0);
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(0);
     });
 
     it('should open in browser if hostname configured', async () => {
-      render(
-        <AppContext.Provider value={{ auth: mockAuth }}>
-          <LoginWithOAuthAppRoute />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<LoginWithOAuthAppRoute />);
 
       const hostname = screen.getByTestId('login-hostname');
       await userEvent.clear(hostname);
@@ -104,22 +84,16 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
 
       await userEvent.click(screen.getByTestId('login-create-oauth-app'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
     });
   });
 
   it('should login using a token - success', async () => {
     mockLoginWithOAuthApp.mockResolvedValueOnce(null);
 
-    render(
-      <AppContext.Provider
-        value={{
-          loginWithOAuthApp: mockLoginWithOAuthApp,
-        }}
-      >
-        <LoginWithOAuthAppRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithOAuthAppRoute />, {
+      loginWithOAuthApp: mockLoginWithOAuthApp,
+    });
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -142,11 +116,7 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   });
 
   it('should render the form with errors', async () => {
-    render(
-      <AppContext.Provider value={{ auth: mockAuth }}>
-        <LoginWithOAuthAppRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithOAuthAppRoute />);
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -166,14 +136,10 @@ describe('renderer/routes/LoginWithOAuthApp.tsx', () => {
   });
 
   it('should open help docs in the browser', async () => {
-    render(
-      <AppContext.Provider value={{ auth: mockAuth }}>
-        <LoginWithOAuthAppRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithOAuthAppRoute />);
 
     await userEvent.click(screen.getByTestId('login-docs'));
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
index e9d5b8b06..84f6afe72 100644
--- a/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
+++ b/src/renderer/routes/LoginWithPersonalAccessToken.test.tsx
@@ -1,7 +1,7 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { AppContext } from '../context/App';
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import * as comms from '../utils/comms';
 import {
   LoginWithPersonalAccessTokenRoute,
@@ -16,7 +16,7 @@ jest.mock('react-router-dom', () => ({
 
 describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   const mockLoginWithPersonalAccessToken = jest.fn();
-  const openExternalLinkMock = jest
+  const mockOpenExternalLink = jest
     .spyOn(comms, 'openExternalLink')
     .mockImplementation();
 
@@ -25,13 +25,13 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('renders correctly', () => {
-    const tree = render(<LoginWithPersonalAccessTokenRoute />);
+    const tree = renderWithAppContext(<LoginWithPersonalAccessTokenRoute />);
 
     expect(tree).toMatchSnapshot();
   });
 
   it('let us go back', async () => {
-    render(<LoginWithPersonalAccessTokenRoute />);
+    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />);
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
@@ -61,52 +61,34 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
 
   describe("'Generate a PAT' button", () => {
     it('should be disabled if no hostname configured', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
-          }}
-        >
-          <LoginWithPersonalAccessTokenRoute />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+        loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
+      });
 
       await userEvent.clear(screen.getByTestId('login-hostname'));
 
       await userEvent.click(screen.getByTestId('login-create-token'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(0);
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(0);
     });
 
     it('should open in browser if hostname configured', async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
-          }}
-        >
-          <LoginWithPersonalAccessTokenRoute />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+        loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
+      });
 
       await userEvent.click(screen.getByTestId('login-create-token'));
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
     });
   });
 
   it('should login using a token - success', async () => {
     mockLoginWithPersonalAccessToken.mockResolvedValueOnce(null);
 
-    render(
-      <AppContext.Provider
-        value={{
-          loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
-        }}
-      >
-        <LoginWithPersonalAccessTokenRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+      loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
+    });
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -130,15 +112,9 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   it('should login using a token - failure', async () => {
     mockLoginWithPersonalAccessToken.mockRejectedValueOnce(null);
 
-    render(
-      <AppContext.Provider
-        value={{
-          loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
-        }}
-      >
-        <LoginWithPersonalAccessTokenRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+      loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
+    });
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -160,7 +136,7 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('should render the form with errors', async () => {
-    render(<LoginWithPersonalAccessTokenRoute />);
+    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />);
 
     const hostname = screen.getByTestId('login-hostname');
     await userEvent.clear(hostname);
@@ -175,18 +151,12 @@ describe('renderer/routes/LoginWithPersonalAccessToken.tsx', () => {
   });
 
   it('should open help docs in the browser', async () => {
-    render(
-      <AppContext.Provider
-        value={{
-          loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
-        }}
-      >
-        <LoginWithPersonalAccessTokenRoute />
-      </AppContext.Provider>,
-    );
+    renderWithAppContext(<LoginWithPersonalAccessTokenRoute />, {
+      loginWithPersonalAccessToken: mockLoginWithPersonalAccessToken,
+    });
 
     await userEvent.click(screen.getByTestId('login-docs'));
 
-    expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
+    expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/src/renderer/routes/Notifications.test.tsx b/src/renderer/routes/Notifications.test.tsx
index 0c5f83e65..5c4bf414f 100644
--- a/src/renderer/routes/Notifications.test.tsx
+++ b/src/renderer/routes/Notifications.test.tsx
@@ -1,8 +1,6 @@
-import { render } from '@testing-library/react';
-
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import { mockAccountNotifications } from '../__mocks__/notifications-mocks';
 import { mockSettings } from '../__mocks__/state-mocks';
-import { AppContext } from '../context/App';
 import { Errors } from '../utils/errors';
 import { NotificationsRoute } from './Notifications';
 
@@ -20,115 +18,68 @@ jest.mock('../components/Oops', () => ({
 
 describe('renderer/routes/Notifications.tsx', () => {
   it('should render itself & its children (with notifications)', () => {
-    const tree = render(
-      <AppContext.Provider value={{ notifications: mockAccountNotifications }}>
-        <NotificationsRoute />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationsRoute />, {
+      notifications: mockAccountNotifications,
+    });
 
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children (all read notifications)', () => {
-    const tree = render(
-      <AppContext.Provider value={{ notifications: [] }}>
-        <NotificationsRoute />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationsRoute />);
     expect(tree).toMatchSnapshot();
   });
 
   it('should render itself & its children (show account header)', () => {
-    const tree = render(
-      <AppContext.Provider
-        value={{
-          notifications: [mockAccountNotifications[0]],
-          settings: { ...mockSettings, showAccountHeader: true },
-        }}
-      >
-        <NotificationsRoute />
-      </AppContext.Provider>,
-    );
+    const tree = renderWithAppContext(<NotificationsRoute />, {
+      notifications: [mockAccountNotifications[0]],
+      settings: { ...mockSettings, showAccountHeader: true },
+    });
     expect(tree).toMatchSnapshot();
   });
 
   describe('should render itself & its children (error conditions - oops)', () => {
     it('bad credentials', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            notifications: [],
-            status: 'error',
-            globalError: Errors.BAD_CREDENTIALS,
-          }}
-        >
-          <NotificationsRoute />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationsRoute />, {
+        status: 'error',
+        globalError: Errors.BAD_CREDENTIALS,
+      });
 
       expect(tree).toMatchSnapshot();
     });
 
     it('missing scopes', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            notifications: [],
-            status: 'error',
-            globalError: Errors.MISSING_SCOPES,
-          }}
-        >
-          <NotificationsRoute />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationsRoute />, {
+        status: 'error',
+        globalError: Errors.MISSING_SCOPES,
+      });
 
       expect(tree).toMatchSnapshot();
     });
 
     it('rate limited', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            notifications: [],
-            status: 'error',
-            globalError: Errors.RATE_LIMITED,
-          }}
-        >
-          <NotificationsRoute />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationsRoute />, {
+        status: 'error',
+        globalError: Errors.RATE_LIMITED,
+      });
 
       expect(tree).toMatchSnapshot();
     });
 
     it('unknown error', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            notifications: [],
-            status: 'error',
-            globalError: Errors.UNKNOWN,
-          }}
-        >
-          <NotificationsRoute />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationsRoute />, {
+        status: 'error',
+        globalError: Errors.UNKNOWN,
+      });
 
       expect(tree).toMatchSnapshot();
     });
 
     it('default error', () => {
-      const tree = render(
-        <AppContext.Provider
-          value={{
-            notifications: [],
-            status: 'error',
-            globalError: null,
-          }}
-        >
-          <NotificationsRoute />
-        </AppContext.Provider>,
-      );
+      const tree = renderWithAppContext(<NotificationsRoute />, {
+        status: 'error',
+        globalError: null,
+      });
 
       expect(tree).toMatchSnapshot();
     });
diff --git a/src/renderer/routes/Settings.test.tsx b/src/renderer/routes/Settings.test.tsx
index ba03a471a..a254d8a1d 100644
--- a/src/renderer/routes/Settings.test.tsx
+++ b/src/renderer/routes/Settings.test.tsx
@@ -1,8 +1,7 @@
-import { act, render, screen } from '@testing-library/react';
+import { act, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { mockAuth, mockSettings } from '../__mocks__/state-mocks';
-import { AppContext } from '../context/App';
+import { renderWithAppContext } from '../__helpers__/test-utils';
 import { SettingsRoute } from './Settings';
 
 const mockNavigate = jest.fn();
@@ -12,7 +11,7 @@ jest.mock('react-router-dom', () => ({
 }));
 
 describe('renderer/routes/Settings.tsx', () => {
-  const fetchNotifications = jest.fn();
+  const mockFetchNotifications = jest.fn();
 
   afterEach(() => {
     jest.clearAllMocks();
@@ -20,11 +19,7 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should render itself & its children', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider value={{ auth: mockAuth, settings: mockSettings }}>
-          <SettingsRoute />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsRoute />);
     });
 
     expect(screen.getByTestId('settings')).toMatchSnapshot();
@@ -32,22 +27,14 @@ describe('renderer/routes/Settings.tsx', () => {
 
   it('should go back by pressing the icon', async () => {
     await act(async () => {
-      render(
-        <AppContext.Provider
-          value={{
-            auth: mockAuth,
-            settings: mockSettings,
-            fetchNotifications,
-          }}
-        >
-          <SettingsRoute />
-        </AppContext.Provider>,
-      );
+      renderWithAppContext(<SettingsRoute />, {
+        fetchNotifications: mockFetchNotifications,
+      });
     });
 
     await userEvent.click(screen.getByTestId('header-nav-back'));
 
-    expect(fetchNotifications).toHaveBeenCalledTimes(1);
+    expect(mockFetchNotifications).toHaveBeenCalledTimes(1);
     expect(mockNavigate).toHaveBeenNthCalledWith(1, -1);
   });
 });
diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
deleted file mode 100644
index 9466544fc..000000000
--- a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
+++ /dev/null
@@ -1,3697 +0,0 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-
-exports[`renderer/routes/Accounts.tsx Account interactions should render with PAT scopes warning 1`] = `
-<div
-  class="flex flex-col h-screen"
-  data-testid="accounts"
->
-  <div
-    class="pl-4 pr-5 pt-3 pb-1"
-  >
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="space-between"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_2s_-loading-announcement"
-        aria-labelledby="Go Back"
-        class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-        data-component="IconButton"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="header-nav-back"
-        data-variant="invisible"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-arrow-left"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
-        >
-          <path
-            d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-          />
-        </svg>
-      </button>
-      <legend>
-        <div
-          class="mb-2"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-accounts"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
-            >
-              Accounts
-            </h4>
-          </div>
-        </div>
-      </legend>
-    </div>
-  </div>
-  <div
-    class="grow overflow-x-hidden overflow-y-auto px-5"
-  >
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_2t_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.com
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-key"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Personal Access Token
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_2v_-loading-announcement"
-              aria-labelledby="_r_2u_"
-              class="prc-Button-ButtonBase-c50BI visible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_2u_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_31_-loading-announcement"
-              aria-labelledby="_r_30_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="primary"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_30_"
-              popover="auto"
-            >
-              Primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_33_-loading-announcement"
-                aria-labelledby="_r_32_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_32_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_35_-loading-announcement"
-              aria-labelledby="_r_34_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_34_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_36_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-server"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v4c0 .372-.116.717-.314 1 .198.283.314.628.314 1v4a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 12.75v-4c0-.358.109-.707.314-1a1.739 1.739 0 0 1-.314-1v-4C0 1.784.784 1 1.75 1ZM1.5 2.75v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm.25 5.75a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM7 4.75A.75.75 0 0 1 7.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 7 4.75ZM7.75 10h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM3 4.75A.75.75 0 0 1 3.75 4h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 4.75ZM3.75 10h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.gitify.io
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  OAuth App
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_38_-loading-announcement"
-              aria-labelledby="_r_37_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_37_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_3a_-loading-announcement"
-              aria-labelledby="_r_39_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="default"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_39_"
-              popover="auto"
-            >
-              Set as primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_3c_-loading-announcement"
-                aria-labelledby="_r_3b_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3b_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_3e_-loading-announcement"
-              aria-labelledby="_r_3d_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3d_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_3f_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.com
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-apps"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.5 3.25c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5A1.75 1.75 0 0 1 5.75 7.5h-2.5A1.75 1.75 0 0 1 1.5 5.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5A1.75 1.75 0 0 1 8.5 5.75Zm-7 7c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75ZM3.25 3a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5A.25.25 0 0 0 6 5.75v-2.5A.25.25 0 0 0 5.75 3Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm-7 7a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  GitHub App
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_3h_-loading-announcement"
-              aria-labelledby="_r_3g_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3g_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_3j_-loading-announcement"
-              aria-labelledby="_r_3i_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="default"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3i_"
-              popover="auto"
-            >
-              Set as primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_3l_-loading-announcement"
-                aria-labelledby="_r_3k_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3k_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_3n_-loading-announcement"
-              aria-labelledby="_r_3m_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3m_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="left-sidebar bg-gitify-footer"
-  >
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="end"
-      data-padding="condensed"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_3o_-loading-announcement"
-        aria-expanded="false"
-        aria-haspopup="true"
-        class="prc-Button-ButtonBase-c50BI"
-        data-loading="false"
-        data-size="medium"
-        data-testid="account-add-new"
-        data-variant="default"
-        id="_r_3o_"
-        tabindex="0"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-            data-component="leadingVisual"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person-add"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.9 8.548h-.001a5.528 5.528 0 0 1 3.1 4.659.75.75 0 1 1-1.498.086A4.01 4.01 0 0 0 5.5 9.5a4.01 4.01 0 0 0-4.001 3.793.75.75 0 1 1-1.498-.085 5.527 5.527 0 0 1 3.1-4.66 3.5 3.5 0 1 1 4.799 0ZM13.25 0a.75.75 0 0 1 .75.75V2h1.25a.75.75 0 0 1 0 1.5H14v1.25a.75.75 0 0 1-1.5 0V3.5h-1.25a.75.75 0 0 1 0-1.5h1.25V.75a.75.75 0 0 1 .75-.75ZM5.5 4a2 2 0 1 0-.001 3.999A2 2 0 0 0 5.5 4Z"
-              />
-            </svg>
-          </span>
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
-          >
-            Add new account
-          </span>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/routes/Accounts.tsx Account interactions should set account as primary account 1`] = `
-<div
-  class="flex flex-col h-screen"
-  data-testid="accounts"
->
-  <div
-    class="pl-4 pr-5 pt-3 pb-1"
-  >
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="space-between"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_3r_-loading-announcement"
-        aria-labelledby="Go Back"
-        class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-        data-component="IconButton"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="header-nav-back"
-        data-variant="invisible"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-arrow-left"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
-        >
-          <path
-            d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-          />
-        </svg>
-      </button>
-      <legend>
-        <div
-          class="mb-2"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-accounts"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
-            >
-              Accounts
-            </h4>
-          </div>
-        </div>
-      </legend>
-    </div>
-  </div>
-  <div
-    class="grow overflow-x-hidden overflow-y-auto px-5"
-  >
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_3s_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.com
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-key"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Personal Access Token
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_3u_-loading-announcement"
-              aria-labelledby="_r_3t_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3t_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_40_-loading-announcement"
-              aria-labelledby="_r_3v_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="primary"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_3v_"
-              popover="auto"
-            >
-              Primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_42_-loading-announcement"
-                aria-labelledby="_r_41_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_41_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_44_-loading-announcement"
-              aria-labelledby="_r_43_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_43_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_45_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-server"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v4c0 .372-.116.717-.314 1 .198.283.314.628.314 1v4a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 12.75v-4c0-.358.109-.707.314-1a1.739 1.739 0 0 1-.314-1v-4C0 1.784.784 1 1.75 1ZM1.5 2.75v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm.25 5.75a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM7 4.75A.75.75 0 0 1 7.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 7 4.75ZM7.75 10h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM3 4.75A.75.75 0 0 1 3.75 4h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 4.75ZM3.75 10h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.gitify.io
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  OAuth App
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_47_-loading-announcement"
-              aria-labelledby="_r_46_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_46_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_49_-loading-announcement"
-              aria-labelledby="_r_48_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="default"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_48_"
-              popover="auto"
-            >
-              Set as primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_4b_-loading-announcement"
-                aria-labelledby="_r_4a_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4a_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_4d_-loading-announcement"
-              aria-labelledby="_r_4c_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4c_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_4e_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.com
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-apps"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.5 3.25c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5A1.75 1.75 0 0 1 5.75 7.5h-2.5A1.75 1.75 0 0 1 1.5 5.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5A1.75 1.75 0 0 1 8.5 5.75Zm-7 7c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75ZM3.25 3a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5A.25.25 0 0 0 6 5.75v-2.5A.25.25 0 0 0 5.75 3Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm-7 7a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  GitHub App
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_4g_-loading-announcement"
-              aria-labelledby="_r_4f_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4f_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_4i_-loading-announcement"
-              aria-labelledby="_r_4h_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="default"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4h_"
-              popover="auto"
-            >
-              Set as primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_4k_-loading-announcement"
-                aria-labelledby="_r_4j_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4j_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_4m_-loading-announcement"
-              aria-labelledby="_r_4l_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4l_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="left-sidebar bg-gitify-footer"
-  >
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="end"
-      data-padding="condensed"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_4n_-loading-announcement"
-        aria-expanded="false"
-        aria-haspopup="true"
-        class="prc-Button-ButtonBase-c50BI"
-        data-loading="false"
-        data-size="medium"
-        data-testid="account-add-new"
-        data-variant="default"
-        id="_r_4n_"
-        tabindex="0"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-            data-component="leadingVisual"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person-add"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.9 8.548h-.001a5.528 5.528 0 0 1 3.1 4.659.75.75 0 1 1-1.498.086A4.01 4.01 0 0 0 5.5 9.5a4.01 4.01 0 0 0-4.001 3.793.75.75 0 1 1-1.498-.085 5.527 5.527 0 0 1 3.1-4.66 3.5 3.5 0 1 1 4.799 0ZM13.25 0a.75.75 0 0 1 .75.75V2h1.25a.75.75 0 0 1 0 1.5H14v1.25a.75.75 0 0 1-1.5 0V3.5h-1.25a.75.75 0 0 1 0-1.5h1.25V.75a.75.75 0 0 1 .75-.75ZM5.5 4a2 2 0 1 0-.001 3.999A2 2 0 0 0 5.5 4Z"
-              />
-            </svg>
-          </span>
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
-          >
-            Add new account
-          </span>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`renderer/routes/Accounts.tsx General should render itself & its children 1`] = `
-<div
-  class="flex flex-col h-screen"
-  data-testid="accounts"
->
-  <div
-    class="pl-4 pr-5 pt-3 pb-1"
-  >
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="space-between"
-      data-padding="none"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_0_-loading-announcement"
-        aria-labelledby="Go Back"
-        class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-        data-component="IconButton"
-        data-loading="false"
-        data-no-visuals="true"
-        data-size="medium"
-        data-testid="header-nav-back"
-        data-variant="invisible"
-        type="button"
-      >
-        <svg
-          aria-hidden="true"
-          class="octicon octicon-arrow-left"
-          display="inline-block"
-          fill="currentColor"
-          focusable="false"
-          height="16"
-          overflow="visible"
-          style="vertical-align: text-bottom;"
-          viewBox="0 0 16 16"
-          width="16"
-        >
-          <path
-            d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-          />
-        </svg>
-      </button>
-      <legend>
-        <div
-          class="mb-2"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-            id="title-accounts"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-              />
-            </svg>
-            <h4
-              class="prc-Heading-Heading-6CmGO"
-            >
-              Accounts
-            </h4>
-          </div>
-        </div>
-      </legend>
-    </div>
-  </div>
-  <div
-    class="grow overflow-x-hidden overflow-y-auto px-5"
-  >
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_1_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.com
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-key"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Personal Access Token
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_3_-loading-announcement"
-              aria-labelledby="_r_2_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_2_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_5_-loading-announcement"
-              aria-labelledby="_r_4_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="primary"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_4_"
-              popover="auto"
-            >
-              Primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_7_-loading-announcement"
-                aria-labelledby="_r_6_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_6_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_9_-loading-announcement"
-              aria-labelledby="_r_8_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_8_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_a_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-server"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.75 1h12.5c.966 0 1.75.784 1.75 1.75v4c0 .372-.116.717-.314 1 .198.283.314.628.314 1v4a1.75 1.75 0 0 1-1.75 1.75H1.75A1.75 1.75 0 0 1 0 12.75v-4c0-.358.109-.707.314-1a1.739 1.739 0 0 1-.314-1v-4C0 1.784.784 1 1.75 1ZM1.5 2.75v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25H1.75a.25.25 0 0 0-.25.25Zm.25 5.75a.25.25 0 0 0-.25.25v4c0 .138.112.25.25.25h12.5a.25.25 0 0 0 .25-.25v-4a.25.25 0 0 0-.25-.25ZM7 4.75A.75.75 0 0 1 7.75 4h4.5a.75.75 0 0 1 0 1.5h-4.5A.75.75 0 0 1 7 4.75ZM7.75 10h4.5a.75.75 0 0 1 0 1.5h-4.5a.75.75 0 0 1 0-1.5ZM3 4.75A.75.75 0 0 1 3.75 4h.5a.75.75 0 0 1 0 1.5h-.5A.75.75 0 0 1 3 4.75ZM3.75 10h.5a.75.75 0 0 1 0 1.5h-.5a.75.75 0 0 1 0-1.5Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.gitify.io
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  OAuth App
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_c_-loading-announcement"
-              aria-labelledby="_r_b_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_b_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_e_-loading-announcement"
-              aria-labelledby="_r_d_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="default"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_d_"
-              popover="auto"
-            >
-              Set as primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_g_-loading-announcement"
-                aria-labelledby="_r_f_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_f_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_i_-loading-announcement"
-              aria-labelledby="_r_h_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_h_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="rounded-md p-2 mb-4 bg-gitify-accounts"
-    >
-      <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="stretch"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_j_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="account-profile"
-            data-variant="default"
-            title="Open account profile ↗"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-testid="avatar"
-                  data-wrap="nowrap"
-                >
-                  <img
-                    alt="octocat"
-                    class="prc-Avatar-Avatar-ZRS-m"
-                    data-component="Avatar"
-                    height="20"
-                    src="https://avatars.githubusercontent.com/u/583231?v=4"
-                    style="--avatarSize-regular: 20px;"
-                    width="20"
-                  />
-                  <div
-                    class="prc-Truncate-Truncate-A9Wn6"
-                    data-inline="true"
-                    style="--truncate-max-width: 280px;"
-                    title="@octocat"
-                  >
-                    @octocat
-                  </div>
-                </div>
-              </span>
-            </span>
-          </button>
-        </div>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="start"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="pl-2 pb-2 text-xs"
-          >
-            <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  Mona Lisa Octocat
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-host"
-                data-wrap="nowrap"
-                title="Open host ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  github.com
-                </span>
-              </div>
-              <div
-                class="cursor-pointer prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-testid="account-developer-settings"
-                data-wrap="nowrap"
-                title="Open developer settings ↗"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-apps"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.5 3.25c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5A1.75 1.75 0 0 1 5.75 7.5h-2.5A1.75 1.75 0 0 1 1.5 5.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5A1.75 1.75 0 0 1 8.5 5.75Zm-7 7c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75Zm7 0c0-.966.784-1.75 1.75-1.75h2.5c.966 0 1.75.784 1.75 1.75v2.5a1.75 1.75 0 0 1-1.75 1.75h-2.5a1.75 1.75 0 0 1-1.75-1.75ZM3.25 3a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5A.25.25 0 0 0 6 5.75v-2.5A.25.25 0 0 0 5.75 3Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm-7 7a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Zm7 0a.25.25 0 0 0-.25.25v2.5c0 .138.112.25.25.25h2.5a.25.25 0 0 0 .25-.25v-2.5a.25.25 0 0 0-.25-.25Z"
-                  />
-                </svg>
-                <span
-                  class="prc-Text-Text-0ima0"
-                >
-                  GitHub App
-                </span>
-              </div>
-            </div>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_l_-loading-announcement"
-              aria-labelledby="_r_k_"
-              class="prc-Button-ButtonBase-c50BI invisible prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-missing-scopes"
-              data-variant="default"
-              style="color: orange;"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-alert-fill"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M6.457 1.047c.659-1.234 2.427-1.234 3.086 0l6.082 11.378A1.75 1.75 0 0 1 14.082 15H1.918a1.75 1.75 0 0 1-1.543-2.575ZM8 5a.75.75 0 0 0-.75.75v2.5a.75.75 0 0 0 1.5 0v-2.5A.75.75 0 0 0 8 5Zm1 6a1 1 0 1 0-2 0 1 1 0 0 0 2 0Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_k_"
-              popover="auto"
-            >
-              This account is missing one or more required scopes: [read:user, notifications, repo] or [read:user, notifications, public_repo]
-            </span>
-            <button
-              aria-describedby="_r_n_-loading-announcement"
-              aria-labelledby="_r_m_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-set-primary"
-              data-variant="default"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-star"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M8 .25a.75.75 0 0 1 .673.418l1.882 3.815 4.21.612a.75.75 0 0 1 .416 1.279l-3.046 2.97.719 4.192a.751.751 0 0 1-1.088.791L8 12.347l-3.766 1.98a.75.75 0 0 1-1.088-.79l.72-4.194L.818 6.374a.75.75 0 0 1 .416-1.28l4.21-.611L7.327.668A.75.75 0 0 1 8 .25Zm0 2.445L6.615 5.5a.75.75 0 0 1-.564.41l-3.097.45 2.24 2.184a.75.75 0 0 1 .216.664l-.528 3.084 2.769-1.456a.75.75 0 0 1 .698 0l2.77 1.456-.53-3.084a.75.75 0 0 1 .216-.664l2.24-2.183-3.096-.45a.75.75 0 0 1-.564-.41L8 2.694Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_m_"
-              popover="auto"
-            >
-              Set as primary account
-            </span>
-            <div
-              data-loading-wrapper="true"
-            >
-              <button
-                aria-describedby="_r_p_-loading-announcement"
-                aria-labelledby="_r_o_"
-                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-                data-component="IconButton"
-                data-loading="false"
-                data-no-visuals="true"
-                data-size="small"
-                data-testid="account-refresh"
-                data-variant="default"
-                type="button"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-sync"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M1.705 8.005a.75.75 0 0 1 .834.656 5.5 5.5 0 0 0 9.592 2.97l-1.204-1.204a.25.25 0 0 1 .177-.427h3.646a.25.25 0 0 1 .25.25v3.646a.25.25 0 0 1-.427.177l-1.38-1.38A7.002 7.002 0 0 1 1.05 8.84a.75.75 0 0 1 .656-.834ZM8 2.5a5.487 5.487 0 0 0-4.131 1.869l1.204 1.204A.25.25 0 0 1 4.896 6H1.25A.25.25 0 0 1 1 5.75V2.104a.25.25 0 0 1 .427-.177l1.38 1.38A7.002 7.002 0 0 1 14.95 7.16a.75.75 0 0 1-1.49.178A5.5 5.5 0 0 0 8 2.5Z"
-                  />
-                </svg>
-              </button>
-            </div>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_o_"
-              popover="auto"
-            >
-              Refresh octocat
-            </span>
-            <button
-              aria-describedby="_r_r_-loading-announcement"
-              aria-labelledby="_r_q_"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="small"
-              data-testid="account-logout"
-              data-variant="danger"
-              type="button"
-            >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-sign-out"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm10.44 4.5-1.97-1.97a.749.749 0 0 1 .326-1.275.749.749 0 0 1 .734.215l3.25 3.25a.75.75 0 0 1 0 1.06l-3.25 3.25a.749.749 0 0 1-1.275-.326.749.749 0 0 1 .215-.734l1.97-1.97H6.75a.75.75 0 0 1 0-1.5Z"
-                />
-              </svg>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_q_"
-              popover="auto"
-            >
-              Logout octocat
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div
-    class="left-sidebar bg-gitify-footer"
-  >
-    <div
-      class="prc-Stack-Stack-WJVsK"
-      data-align="stretch"
-      data-direction="horizontal"
-      data-justify="end"
-      data-padding="condensed"
-      data-wrap="nowrap"
-    >
-      <button
-        aria-describedby="_r_s_-loading-announcement"
-        aria-expanded="false"
-        aria-haspopup="true"
-        class="prc-Button-ButtonBase-c50BI"
-        data-loading="false"
-        data-size="medium"
-        data-testid="account-add-new"
-        data-variant="default"
-        id="_r_s_"
-        tabindex="0"
-        type="button"
-      >
-        <span
-          class="prc-Button-ButtonContent-HKbr-"
-          data-align="center"
-          data-component="buttonContent"
-        >
-          <span
-            class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-            data-component="leadingVisual"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-person-add"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.9 8.548h-.001a5.528 5.528 0 0 1 3.1 4.659.75.75 0 1 1-1.498.086A4.01 4.01 0 0 0 5.5 9.5a4.01 4.01 0 0 0-4.001 3.793.75.75 0 1 1-1.498-.085 5.527 5.527 0 0 1 3.1-4.66 3.5 3.5 0 1 1 4.799 0ZM13.25 0a.75.75 0 0 1 .75.75V2h1.25a.75.75 0 0 1 0 1.5H14v1.25a.75.75 0 0 1-1.5 0V3.5h-1.25a.75.75 0 0 1 0-1.5h1.25V.75a.75.75 0 0 1 .75-.75ZM5.5 4a2 2 0 1 0-.001 3.999A2 2 0 0 0 5.5 4Z"
-              />
-            </svg>
-          </span>
-          <span
-            class="prc-Button-Label-pTQ3x"
-            data-component="text"
-          >
-            Add new account
-          </span>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;
diff --git a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
index 3887338dc..b618312f0 100644
--- a/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Filters.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_0_-loading-announcement"
+        aria-describedby="_r_1_-loading-announcement"
         aria-labelledby="Go Back"
         class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
         data-component="IconButton"
@@ -2031,7 +2031,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_q_-loading-announcement _r_p_"
+        aria-describedby="_r_r_-loading-announcement _r_q_"
         class="prc-Button-ButtonBase-c50BI"
         data-loading="false"
         data-size="medium"
@@ -2077,7 +2077,7 @@ exports[`renderer/routes/Filters.tsx General should render itself & its children
         aria-hidden="true"
         class="prc-TooltipV2-Tooltip-cYMVY"
         data-direction="n"
-        id="_r_p_"
+        id="_r_q_"
         popover="auto"
         role="tooltip"
       >
diff --git a/src/renderer/routes/__snapshots__/Login.test.tsx.snap b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
index d9d9ea2de..81172fc13 100644
--- a/src/renderer/routes/__snapshots__/Login.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Login.test.tsx.snap
@@ -6,228 +6,239 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="h-screen prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="center"
-        data-padding="spacious"
-        data-wrap="nowrap"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
-          <svg
-            aria-hidden="true"
-            aria-label="Gitify Logo"
-            class="size-16"
-            viewBox="0 0 500 500"
-            xmlns="https://www.w3.org/2000/svg"
-            xmlns:xlink="https://www.w3.org/1999/xlink"
-          >
-            <defs>
-              <lineargradient
-                id="linearGradient-dark"
-                x1="90.8779989%"
-                x2="-1.30249747%"
-                y1="80.0676288%"
-                y2="32.7108237%"
-              >
-                <stop
-                  offset="0%"
-                  stop-color="#22283B"
-                />
-                <stop
-                  offset="100%"
-                  stop-color="#555B6E"
-                />
-              </lineargradient>
-            </defs>
-            <g
-              fill="none"
-              fill-rule="evenodd"
-              stroke="none"
-              stroke-width="1"
-            >
-              <g
-                fill="url(#linearGradient-dark)"
-                fill-rule="nonzero"
-                id="Logo"
-                transform="translate(6.000000, 6.000000)"
-              >
-                <path
-                  d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-                />
-              </g>
-            </g>
-          </svg>
           <div
-            class="prc-Stack-Stack-WJVsK"
+            class="h-screen prc-Stack-Stack-WJVsK"
             data-align="center"
             data-direction="vertical"
-            data-gap="none"
-            data-justify="start"
-            data-padding="none"
+            data-justify="center"
+            data-padding="spacious"
             data-wrap="nowrap"
           >
-            <h2
-              class="prc-Heading-Heading-6CmGO"
-            >
-              GitHub Notifications
-            </h2>
-            <h3
-              class="prc-Heading-Heading-6CmGO"
-            >
-              on your menu bar
-            </h3>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <span
-              class="prc-Text-Text-0ima0"
-            >
-              Login with
-            </span>
-            <button
-              aria-describedby="_r_0_-loading-announcement"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-github"
-              data-variant="primary"
-              type="button"
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="center"
+              data-direction="vertical"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
-                data-align="center"
-                data-component="buttonContent"
+              <svg
+                aria-hidden="true"
+                aria-label="Gitify Logo"
+                class="size-16"
+                viewBox="0 0 500 500"
+                xmlns="https://www.w3.org/2000/svg"
+                xmlns:xlink="https://www.w3.org/1999/xlink"
               >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
+                <defs>
+                  <lineargradient
+                    id="linearGradient-dark"
+                    x1="90.8779989%"
+                    x2="-1.30249747%"
+                    y1="80.0676288%"
+                    y2="32.7108237%"
+                  >
+                    <stop
+                      offset="0%"
+                      stop-color="#22283B"
+                    />
+                    <stop
+                      offset="100%"
+                      stop-color="#555B6E"
+                    />
+                  </lineargradient>
+                </defs>
+                <g
+                  fill="none"
+                  fill-rule="evenodd"
+                  stroke="none"
+                  stroke-width="1"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-mark-github"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
+                  <g
+                    fill="url(#linearGradient-dark)"
+                    fill-rule="nonzero"
+                    id="Logo"
+                    transform="translate(6.000000, 6.000000)"
                   >
                     <path
-                      d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                      d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
                     />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
-                >
-                  GitHub
-                </span>
-              </span>
-            </button>
-            <button
-              aria-describedby="_r_1_-loading-announcement"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-pat"
-              data-variant="default"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
+                  </g>
+                </g>
+              </svg>
+              <div
+                class="prc-Stack-Stack-WJVsK"
                 data-align="center"
-                data-component="buttonContent"
+                data-direction="vertical"
+                data-gap="none"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
+                <h2
+                  class="prc-Heading-Heading-6CmGO"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-key"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
+                  GitHub Notifications
+                </h2>
+                <h3
+                  class="prc-Heading-Heading-6CmGO"
                 >
-                  Personal Access Token
-                </span>
-              </span>
-            </button>
-            <button
-              aria-describedby="_r_2_-loading-announcement"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-oauth-app"
-              data-variant="default"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
+                  on your menu bar
+                </h3>
+              </div>
+              <div
+                class="prc-Stack-Stack-WJVsK"
                 data-align="center"
-                data-component="buttonContent"
+                data-direction="vertical"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
                 <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
+                  class="prc-Text-Text-0ima0"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-person"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                    />
-                  </svg>
+                  Login with
                 </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
+                <button
+                  aria-describedby="_r_1_-loading-announcement"
+                  class="prc-Button-ButtonBase-c50BI"
+                  data-loading="false"
+                  data-size="medium"
+                  data-testid="login-github"
+                  data-variant="primary"
+                  type="button"
                 >
-                  OAuth App
-                </span>
-              </span>
-            </button>
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
+                  >
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-mark-github"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      GitHub
+                    </span>
+                  </span>
+                </button>
+                <button
+                  aria-describedby="_r_2_-loading-announcement"
+                  class="prc-Button-ButtonBase-c50BI"
+                  data-loading="false"
+                  data-size="medium"
+                  data-testid="login-pat"
+                  data-variant="default"
+                  type="button"
+                >
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
+                  >
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-key"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      Personal Access Token
+                    </span>
+                  </span>
+                </button>
+                <button
+                  aria-describedby="_r_3_-loading-announcement"
+                  class="prc-Button-ButtonBase-c50BI"
+                  data-loading="false"
+                  data-size="medium"
+                  data-testid="login-oauth-app"
+                  data-variant="default"
+                  type="button"
+                >
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
+                  >
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-person"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      OAuth App
+                    </span>
+                  </span>
+                </button>
+              </div>
+            </div>
           </div>
         </div>
       </div>
@@ -235,228 +246,239 @@ exports[`renderer/routes/Login.tsx should render itself & its children 1`] = `
   </body>,
   "container": <div>
     <div
-      class="h-screen prc-Stack-Stack-WJVsK"
-      data-align="center"
-      data-direction="vertical"
-      data-justify="center"
-      data-padding="spacious"
-      data-wrap="nowrap"
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
     >
       <div
-        class="prc-Stack-Stack-WJVsK"
-        data-align="center"
-        data-direction="vertical"
-        data-justify="start"
-        data-padding="none"
-        data-wrap="nowrap"
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
       >
-        <svg
-          aria-hidden="true"
-          aria-label="Gitify Logo"
-          class="size-16"
-          viewBox="0 0 500 500"
-          xmlns="https://www.w3.org/2000/svg"
-          xmlns:xlink="https://www.w3.org/1999/xlink"
-        >
-          <defs>
-            <lineargradient
-              id="linearGradient-dark"
-              x1="90.8779989%"
-              x2="-1.30249747%"
-              y1="80.0676288%"
-              y2="32.7108237%"
-            >
-              <stop
-                offset="0%"
-                stop-color="#22283B"
-              />
-              <stop
-                offset="100%"
-                stop-color="#555B6E"
-              />
-            </lineargradient>
-          </defs>
-          <g
-            fill="none"
-            fill-rule="evenodd"
-            stroke="none"
-            stroke-width="1"
-          >
-            <g
-              fill="url(#linearGradient-dark)"
-              fill-rule="nonzero"
-              id="Logo"
-              transform="translate(6.000000, 6.000000)"
-            >
-              <path
-                d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
-              />
-            </g>
-          </g>
-        </svg>
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="center"
-          data-direction="vertical"
-          data-gap="none"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <h2
-            class="prc-Heading-Heading-6CmGO"
-          >
-            GitHub Notifications
-          </h2>
-          <h3
-            class="prc-Heading-Heading-6CmGO"
-          >
-            on your menu bar
-          </h3>
-        </div>
         <div
-          class="prc-Stack-Stack-WJVsK"
+          class="h-screen prc-Stack-Stack-WJVsK"
           data-align="center"
           data-direction="vertical"
-          data-gap="condensed"
-          data-justify="start"
-          data-padding="none"
+          data-justify="center"
+          data-padding="spacious"
           data-wrap="nowrap"
         >
-          <span
-            class="prc-Text-Text-0ima0"
-          >
-            Login with
-          </span>
-          <button
-            aria-describedby="_r_0_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-size="medium"
-            data-testid="login-github"
-            data-variant="primary"
-            type="button"
+          <div
+            class="prc-Stack-Stack-WJVsK"
+            data-align="center"
+            data-direction="vertical"
+            data-justify="start"
+            data-padding="none"
+            data-wrap="nowrap"
           >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
+            <svg
+              aria-hidden="true"
+              aria-label="Gitify Logo"
+              class="size-16"
+              viewBox="0 0 500 500"
+              xmlns="https://www.w3.org/2000/svg"
+              xmlns:xlink="https://www.w3.org/1999/xlink"
             >
-              <span
-                class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                data-component="leadingVisual"
+              <defs>
+                <lineargradient
+                  id="linearGradient-dark"
+                  x1="90.8779989%"
+                  x2="-1.30249747%"
+                  y1="80.0676288%"
+                  y2="32.7108237%"
+                >
+                  <stop
+                    offset="0%"
+                    stop-color="#22283B"
+                  />
+                  <stop
+                    offset="100%"
+                    stop-color="#555B6E"
+                  />
+                </lineargradient>
+              </defs>
+              <g
+                fill="none"
+                fill-rule="evenodd"
+                stroke="none"
+                stroke-width="1"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-mark-github"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
+                <g
+                  fill="url(#linearGradient-dark)"
+                  fill-rule="nonzero"
+                  id="Logo"
+                  transform="translate(6.000000, 6.000000)"
                 >
                   <path
-                    d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                    d="M330.391053,10.2526316 C361.413773,10.2526316 386.562656,35.4015165 386.562656,66.4242368 C386.562656,97.4469571 361.413773,122.595841 330.391053,122.595842 L330.365421,122.570211 L247.319105,122.570211 C180.042515,122.499128 125.399186,176.890222 125.159,244.166421 L125.133789,244.219632 L125.154247,245.84774 C126.219609,301.255958 164.473457,349.116728 218.453292,362.268048 C272.940509,375.542983 329.466993,350.045988 355.583747,300.428701 L272.258632,300.427737 C257.346614,300.427737 243.046846,294.496977 232.512078,283.942976 C221.97731,273.388975 216.072618,259.078414 216.099748,244.166421 C216.099748,213.150778 241.242989,188.007632 272.258632,188.007632 L371.119632,188.007632 C379.28704,188.480415 386.935401,192.166372 392.393842,198.260263 L474.869789,300.324632 L474.978789,300.325211 L474.952789,300.426632 L474.953158,300.427737 L474.951789,300.427632 L474.173714,303.448935 C446.939817,406.220475 353.906452,478.028529 247.319105,478.080211 C118.007789,478.080211 12.8157895,373.144526 12.8157895,244.166421 C12.8157895,115.188316 117.905263,10.2526316 247.319105,10.2526316 L330.391053,10.2526316 Z"
                   />
-                </svg>
-              </span>
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                GitHub
-              </span>
-            </span>
-          </button>
-          <button
-            aria-describedby="_r_1_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-size="medium"
-            data-testid="login-pat"
-            data-variant="default"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
+                </g>
+              </g>
+            </svg>
+            <div
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
-              data-component="buttonContent"
+              data-direction="vertical"
+              data-gap="none"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
-              <span
-                class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                data-component="leadingVisual"
+              <h2
+                class="prc-Heading-Heading-6CmGO"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-key"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                  />
-                </svg>
-              </span>
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
+                GitHub Notifications
+              </h2>
+              <h3
+                class="prc-Heading-Heading-6CmGO"
               >
-                Personal Access Token
-              </span>
-            </span>
-          </button>
-          <button
-            aria-describedby="_r_2_-loading-announcement"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-size="medium"
-            data-testid="login-oauth-app"
-            data-variant="default"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
+                on your menu bar
+              </h3>
+            </div>
+            <div
+              class="prc-Stack-Stack-WJVsK"
               data-align="center"
-              data-component="buttonContent"
+              data-direction="vertical"
+              data-gap="condensed"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
               <span
-                class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                data-component="leadingVisual"
+                class="prc-Text-Text-0ima0"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
+                Login with
               </span>
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
+              <button
+                aria-describedby="_r_1_-loading-announcement"
+                class="prc-Button-ButtonBase-c50BI"
+                data-loading="false"
+                data-size="medium"
+                data-testid="login-github"
+                data-variant="primary"
+                type="button"
               >
-                OAuth App
-              </span>
-            </span>
-          </button>
+                <span
+                  class="prc-Button-ButtonContent-HKbr-"
+                  data-align="center"
+                  data-component="buttonContent"
+                >
+                  <span
+                    class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                    data-component="leadingVisual"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-mark-github"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M8 0c4.42 0 8 3.58 8 8a8.013 8.013 0 0 1-5.45 7.59c-.4.08-.55-.17-.55-.38 0-.27.01-1.13.01-2.2 0-.75-.25-1.23-.54-1.48 1.78-.2 3.65-.88 3.65-3.95 0-.88-.31-1.59-.82-2.15.08-.2.36-1.02-.08-2.12 0 0-.67-.22-2.2.82-.64-.18-1.32-.27-2-.27-.68 0-1.36.09-2 .27-1.53-1.03-2.2-.82-2.2-.82-.44 1.1-.16 1.92-.08 2.12-.51.56-.82 1.28-.82 2.15 0 3.06 1.86 3.75 3.64 3.95-.23.2-.44.55-.51 1.07-.46.21-1.61.55-2.33-.66-.15-.24-.6-.83-1.23-.82-.67.01-.27.38.01.53.34.19.73.9.82 1.13.16.45.68 1.31 2.69.94 0 .67.01 1.3.01 1.49 0 .21-.15.45-.55.38A7.995 7.995 0 0 1 0 8c0-4.42 3.58-8 8-8Z"
+                      />
+                    </svg>
+                  </span>
+                  <span
+                    class="prc-Button-Label-pTQ3x"
+                    data-component="text"
+                  >
+                    GitHub
+                  </span>
+                </span>
+              </button>
+              <button
+                aria-describedby="_r_2_-loading-announcement"
+                class="prc-Button-ButtonBase-c50BI"
+                data-loading="false"
+                data-size="medium"
+                data-testid="login-pat"
+                data-variant="default"
+                type="button"
+              >
+                <span
+                  class="prc-Button-ButtonContent-HKbr-"
+                  data-align="center"
+                  data-component="buttonContent"
+                >
+                  <span
+                    class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                    data-component="leadingVisual"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-key"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                      />
+                    </svg>
+                  </span>
+                  <span
+                    class="prc-Button-Label-pTQ3x"
+                    data-component="text"
+                  >
+                    Personal Access Token
+                  </span>
+                </span>
+              </button>
+              <button
+                aria-describedby="_r_3_-loading-announcement"
+                class="prc-Button-ButtonBase-c50BI"
+                data-loading="false"
+                data-size="medium"
+                data-testid="login-oauth-app"
+                data-variant="default"
+                type="button"
+              >
+                <span
+                  class="prc-Button-ButtonContent-HKbr-"
+                  data-align="center"
+                  data-component="buttonContent"
+                >
+                  <span
+                    class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                    data-component="leadingVisual"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      class="octicon octicon-person"
+                      display="inline-block"
+                      fill="currentColor"
+                      focusable="false"
+                      height="16"
+                      overflow="visible"
+                      style="vertical-align: text-bottom;"
+                      viewBox="0 0 16 16"
+                      width="16"
+                    >
+                      <path
+                        d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                      />
+                    </svg>
+                  </span>
+                  <span
+                    class="prc-Button-Label-pTQ3x"
+                    data-component="text"
+                  >
+                    OAuth App
+                  </span>
+                </span>
+              </button>
+            </div>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
index 9707a5e76..b68ec672e 100644
--- a/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithOAuthApp.test.tsx.snap
@@ -6,66 +6,44 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
   "baseElement": <body>
     <div>
       <div
-        class="flex flex-col h-screen"
-        data-testid="Login With OAuth App"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="pl-4 pr-5 pt-3 pb-1"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex flex-col h-screen"
+            data-testid="Login With OAuth App"
           >
-            <button
-              aria-describedby="_r_0_-loading-announcement"
-              aria-labelledby="Go Back"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="medium"
-              data-testid="header-nav-back"
-              data-variant="invisible"
-              type="button"
+            <div
+              class="pl-4 pr-5 pt-3 pb-1"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-arrow-left"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-                />
-              </svg>
-            </button>
-            <legend>
               <div
-                class="mb-2"
+                class="prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="horizontal"
+                data-justify="space-between"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
-                  id="title-login-with-oauth-app"
+                <button
+                  aria-describedby="_r_1_-loading-announcement"
+                  aria-labelledby="Go Back"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="medium"
+                  data-testid="header-nav-back"
+                  data-variant="invisible"
+                  type="button"
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-person"
+                    class="octicon octicon-arrow-left"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -76,106 +54,480 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                     width="16"
                   >
                     <path
-                      d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                      d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
                     />
                   </svg>
-                  <h4
-                    class="prc-Heading-Heading-6CmGO"
+                </button>
+                <legend>
+                  <div
+                    class="mb-2"
                   >
-                    Login with OAuth App
-                  </h4>
-                </div>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                      id="title-login-with-oauth-app"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-person"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                        />
+                      </svg>
+                      <h4
+                        class="prc-Heading-Heading-6CmGO"
+                      >
+                        Login with OAuth App
+                      </h4>
+                    </div>
+                  </div>
+                </legend>
               </div>
-            </legend>
-          </div>
-        </div>
-        <div
-          class="grow overflow-x-hidden overflow-y-auto px-5"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="normal"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
+            </div>
             <div
-              class="prc-FormControl-ControlVerticalLayout-wOp8f"
-              data-has-label=""
+              class="grow overflow-x-hidden overflow-y-auto px-5"
             >
-              <label
-                class="prc-components-Label-bE-kK"
-                for="_r_1_"
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="normal"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <span
-                  class="prc-components-RequiredText-ztJvt"
+                <div
+                  class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                  data-has-label=""
                 >
-                  <span>
-                    Hostname
+                  <label
+                    class="prc-components-Label-bE-kK"
+                    for="_r_2_"
+                  >
+                    <span
+                      class="prc-components-RequiredText-ztJvt"
+                    >
+                      <span>
+                        Hostname
+                      </span>
+                      <span>
+                        *
+                      </span>
+                    </span>
+                  </label>
+                  <span
+                    aria-busy="false"
+                    class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                    data-block="true"
+                  >
+                    <input
+                      aria-describedby="_r_2_-caption"
+                      aria-invalid="false"
+                      aria-required="true"
+                      class="prc-components-Input-Ic-y8"
+                      data-component="input"
+                      data-testid="login-hostname"
+                      id="_r_2_"
+                      name="hostname"
+                      placeholder="github.com"
+                      type="text"
+                      value="github.com"
+                    />
                   </span>
-                  <span>
-                    *
+                  <span
+                    class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
+                    id="_r_2_-caption"
+                  >
+                    <i
+                      class="prc-Text-Text-0ima0"
+                    >
+                      Change only if you are using GitHub Enterprise Server
+                    </i>
                   </span>
-                </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-                data-block="true"
-              >
-                <input
-                  aria-describedby="_r_1_-caption"
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-Ic-y8"
-                  data-component="input"
-                  data-testid="login-hostname"
-                  id="_r_1_"
-                  name="hostname"
-                  placeholder="github.com"
-                  type="text"
-                  value="github.com"
-                />
-              </span>
-              <span
-                class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
-                id="_r_1_-caption"
+                </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
+                >
+                  <button
+                    aria-describedby="_r_6_-loading-announcement"
+                    class="prc-Button-ButtonBase-c50BI"
+                    data-loading="false"
+                    data-size="small"
+                    data-testid="login-create-oauth-app"
+                    data-variant="default"
+                    type="button"
+                  >
+                    <span
+                      class="prc-Button-ButtonContent-HKbr-"
+                      data-align="center"
+                      data-component="buttonContent"
+                    >
+                      <span
+                        class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                        data-component="leadingVisual"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-person"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="16"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="16"
+                        >
+                          <path
+                            d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                          />
+                        </svg>
+                      </span>
+                      <span
+                        class="prc-Button-Label-pTQ3x"
+                        data-component="text"
+                      >
+                        Create new OAuth App
+                      </span>
+                    </span>
+                  </button>
+                  <span
+                    class="text-xs prc-Text-Text-0ima0"
+                  >
+                    and use your 
+                    <i
+                      class="prc-Text-Text-0ima0"
+                    >
+                      client id & secret
+                    </i>
+                     below.
+                  </span>
+                </div>
+                <div
+                  class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                  data-has-label=""
+                >
+                  <label
+                    class="prc-components-Label-bE-kK"
+                    for="_r_7_"
+                  >
+                    <span
+                      class="prc-components-RequiredText-ztJvt"
+                    >
+                      <span>
+                        Client ID
+                      </span>
+                      <span>
+                        *
+                      </span>
+                    </span>
+                  </label>
+                  <span
+                    aria-busy="false"
+                    class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                    data-block="true"
+                  >
+                    <input
+                      aria-invalid="false"
+                      aria-required="true"
+                      class="prc-components-Input-Ic-y8"
+                      data-component="input"
+                      data-testid="login-clientId"
+                      id="_r_7_"
+                      name="clientId"
+                      placeholder="Your generated client id (20 characters)"
+                      type="text"
+                      value=""
+                    />
+                  </span>
+                </div>
+                <div
+                  class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                  data-has-label=""
+                >
+                  <label
+                    class="prc-components-Label-bE-kK"
+                    for="_r_b_"
+                  >
+                    <span
+                      class="prc-components-RequiredText-ztJvt"
+                    >
+                      <span>
+                        Client Secret
+                      </span>
+                      <span>
+                        *
+                      </span>
+                    </span>
+                  </label>
+                  <span
+                    aria-busy="false"
+                    class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                    data-block="true"
+                    data-trailing-action="true"
+                  >
+                    <input
+                      aria-invalid="false"
+                      aria-required="true"
+                      class="prc-components-Input-Ic-y8"
+                      data-component="input"
+                      data-testid="login-clientSecret"
+                      id="_r_b_"
+                      name="clientSecret"
+                      placeholder="Your generated client secret (40 characters)"
+                      type="password"
+                      value=""
+                    />
+                    <span
+                      class="TextInput-action prc-components-TextInputAction-YT3YI"
+                    >
+                      <button
+                        aria-describedby="_r_g_-loading-announcement"
+                        aria-labelledby="_r_f_"
+                        class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
+                        data-component="IconButton"
+                        data-loading="false"
+                        data-no-visuals="true"
+                        data-size="small"
+                        data-variant="invisible"
+                        type="button"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-eye"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="16"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="16"
+                        >
+                          <path
+                            d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+                          />
+                        </svg>
+                      </button>
+                      <span
+                        aria-hidden="true"
+                        class="prc-TooltipV2-Tooltip-cYMVY"
+                        data-direction="s"
+                        id="_r_f_"
+                        popover="auto"
+                      >
+                        Show token
+                      </span>
+                    </span>
+                  </span>
+                </div>
+              </div>
+            </div>
+            <div
+              class="left-sidebar bg-gitify-footer"
+            >
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="horizontal"
+                data-justify="space-between"
+                data-padding="condensed"
+                data-wrap="nowrap"
               >
-                <i
-                  class="prc-Text-Text-0ima0"
+                <button
+                  aria-describedby="_r_i_-loading-announcement _r_h_"
+                  class="prc-Button-ButtonBase-c50BI"
+                  data-loading="false"
+                  data-size="small"
+                  data-testid="login-docs"
+                  data-variant="default"
+                  type="button"
                 >
-                  Change only if you are using GitHub Enterprise Server
-                </i>
-              </span>
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
+                  >
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-book"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      Docs
+                    </span>
+                  </span>
+                </button>
+                <span
+                  aria-hidden="true"
+                  class="prc-TooltipV2-Tooltip-cYMVY"
+                  data-direction="s"
+                  id="_r_h_"
+                  popover="auto"
+                  role="tooltip"
+                >
+                  GitHub documentation
+                </span>
+                <div
+                  data-loading-wrapper="true"
+                >
+                  <button
+                    aria-describedby="_r_j_-loading-announcement"
+                    class="prc-Button-ButtonBase-c50BI"
+                    data-loading="false"
+                    data-size="medium"
+                    data-testid="login-submit"
+                    data-variant="primary"
+                    type="button"
+                  >
+                    <span
+                      class="prc-Button-ButtonContent-HKbr-"
+                      data-align="center"
+                      data-component="buttonContent"
+                    >
+                      <span
+                        class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                        data-component="leadingVisual"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-sign-in"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="16"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="16"
+                        >
+                          <path
+                            d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                          />
+                        </svg>
+                      </span>
+                      <span
+                        class="prc-Button-Label-pTQ3x"
+                        data-component="text"
+                      >
+                        Login
+                      </span>
+                    </span>
+                  </button>
+                </div>
+              </div>
             </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <div
+          class="flex flex-col h-screen"
+          data-testid="Login With OAuth App"
+        >
+          <div
+            class="pl-4 pr-5 pt-3 pb-1"
+          >
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
+              data-justify="space-between"
               data-padding="none"
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_5_-loading-announcement"
-                class="prc-Button-ButtonBase-c50BI"
+                aria-describedby="_r_1_-loading-announcement"
+                aria-labelledby="Go Back"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
                 data-loading="false"
-                data-size="small"
-                data-testid="login-create-oauth-app"
-                data-variant="default"
+                data-no-visuals="true"
+                data-size="medium"
+                data-testid="header-nav-back"
+                data-variant="invisible"
                 type="button"
               >
-                <span
-                  class="prc-Button-ButtonContent-HKbr-"
-                  data-align="center"
-                  data-component="buttonContent"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-arrow-left"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <span
-                    class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                    data-component="leadingVisual"
+                  <path
+                    d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+                  />
+                </svg>
+              </button>
+              <legend>
+                <div
+                  class="mb-2"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                    id="title-login-with-oauth-app"
                   >
                     <svg
                       aria-hidden="true"
@@ -193,221 +545,279 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                         d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
                       />
                     </svg>
-                  </span>
+                    <h4
+                      class="prc-Heading-Heading-6CmGO"
+                    >
+                      Login with OAuth App
+                    </h4>
+                  </div>
+                </div>
+              </legend>
+            </div>
+          </div>
+          <div
+            class="grow overflow-x-hidden overflow-y-auto px-5"
+          >
+            <div
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="normal"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
+            >
+              <div
+                class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                data-has-label=""
+              >
+                <label
+                  class="prc-components-Label-bE-kK"
+                  for="_r_2_"
+                >
                   <span
-                    class="prc-Button-Label-pTQ3x"
-                    data-component="text"
+                    class="prc-components-RequiredText-ztJvt"
                   >
-                    Create new OAuth App
+                    <span>
+                      Hostname
+                    </span>
+                    <span>
+                      *
+                    </span>
                   </span>
+                </label>
+                <span
+                  aria-busy="false"
+                  class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                  data-block="true"
+                >
+                  <input
+                    aria-describedby="_r_2_-caption"
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="prc-components-Input-Ic-y8"
+                    data-component="input"
+                    data-testid="login-hostname"
+                    id="_r_2_"
+                    name="hostname"
+                    placeholder="github.com"
+                    type="text"
+                    value="github.com"
+                  />
                 </span>
-              </button>
-              <span
-                class="text-xs prc-Text-Text-0ima0"
-              >
-                and use your 
-                <i
-                  class="prc-Text-Text-0ima0"
+                <span
+                  class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
+                  id="_r_2_-caption"
                 >
-                  client id & secret
-                </i>
-                 below.
-              </span>
-            </div>
-            <div
-              class="prc-FormControl-ControlVerticalLayout-wOp8f"
-              data-has-label=""
-            >
-              <label
-                class="prc-components-Label-bE-kK"
-                for="_r_6_"
+                  <i
+                    class="prc-Text-Text-0ima0"
+                  >
+                    Change only if you are using GitHub Enterprise Server
+                  </i>
+                </span>
+              </div>
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="center"
+                data-direction="horizontal"
+                data-gap="condensed"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <span
-                  class="prc-components-RequiredText-ztJvt"
+                <button
+                  aria-describedby="_r_6_-loading-announcement"
+                  class="prc-Button-ButtonBase-c50BI"
+                  data-loading="false"
+                  data-size="small"
+                  data-testid="login-create-oauth-app"
+                  data-variant="default"
+                  type="button"
                 >
-                  <span>
-                    Client ID
-                  </span>
-                  <span>
-                    *
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
+                  >
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-person"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      Create new OAuth App
+                    </span>
                   </span>
+                </button>
+                <span
+                  class="text-xs prc-Text-Text-0ima0"
+                >
+                  and use your 
+                  <i
+                    class="prc-Text-Text-0ima0"
+                  >
+                    client id & secret
+                  </i>
+                   below.
                 </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-                data-block="true"
-              >
-                <input
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-Ic-y8"
-                  data-component="input"
-                  data-testid="login-clientId"
-                  id="_r_6_"
-                  name="clientId"
-                  placeholder="Your generated client id (20 characters)"
-                  type="text"
-                  value=""
-                />
-              </span>
-            </div>
-            <div
-              class="prc-FormControl-ControlVerticalLayout-wOp8f"
-              data-has-label=""
-            >
-              <label
-                class="prc-components-Label-bE-kK"
-                for="_r_a_"
+              </div>
+              <div
+                class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                data-has-label=""
               >
-                <span
-                  class="prc-components-RequiredText-ztJvt"
+                <label
+                  class="prc-components-Label-bE-kK"
+                  for="_r_7_"
                 >
-                  <span>
-                    Client Secret
-                  </span>
-                  <span>
-                    *
+                  <span
+                    class="prc-components-RequiredText-ztJvt"
+                  >
+                    <span>
+                      Client ID
+                    </span>
+                    <span>
+                      *
+                    </span>
                   </span>
+                </label>
+                <span
+                  aria-busy="false"
+                  class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                  data-block="true"
+                >
+                  <input
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="prc-components-Input-Ic-y8"
+                    data-component="input"
+                    data-testid="login-clientId"
+                    id="_r_7_"
+                    name="clientId"
+                    placeholder="Your generated client id (20 characters)"
+                    type="text"
+                    value=""
+                  />
                 </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-                data-block="true"
-                data-trailing-action="true"
+              </div>
+              <div
+                class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                data-has-label=""
               >
-                <input
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-Ic-y8"
-                  data-component="input"
-                  data-testid="login-clientSecret"
-                  id="_r_a_"
-                  name="clientSecret"
-                  placeholder="Your generated client secret (40 characters)"
-                  type="password"
-                  value=""
-                />
+                <label
+                  class="prc-components-Label-bE-kK"
+                  for="_r_b_"
+                >
+                  <span
+                    class="prc-components-RequiredText-ztJvt"
+                  >
+                    <span>
+                      Client Secret
+                    </span>
+                    <span>
+                      *
+                    </span>
+                  </span>
+                </label>
                 <span
-                  class="TextInput-action prc-components-TextInputAction-YT3YI"
+                  aria-busy="false"
+                  class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                  data-block="true"
+                  data-trailing-action="true"
                 >
-                  <button
-                    aria-describedby="_r_f_-loading-announcement"
-                    aria-labelledby="_r_e_"
-                    class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
-                    data-component="IconButton"
-                    data-loading="false"
-                    data-no-visuals="true"
-                    data-size="small"
-                    data-variant="invisible"
-                    type="button"
+                  <input
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="prc-components-Input-Ic-y8"
+                    data-component="input"
+                    data-testid="login-clientSecret"
+                    id="_r_b_"
+                    name="clientSecret"
+                    placeholder="Your generated client secret (40 characters)"
+                    type="password"
+                    value=""
+                  />
+                  <span
+                    class="TextInput-action prc-components-TextInputAction-YT3YI"
                   >
-                    <svg
+                    <button
+                      aria-describedby="_r_g_-loading-announcement"
+                      aria-labelledby="_r_f_"
+                      class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
+                      data-component="IconButton"
+                      data-loading="false"
+                      data-no-visuals="true"
+                      data-size="small"
+                      data-variant="invisible"
+                      type="button"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-eye"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+                        />
+                      </svg>
+                    </button>
+                    <span
                       aria-hidden="true"
-                      class="octicon octicon-eye"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="16"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="16"
+                      class="prc-TooltipV2-Tooltip-cYMVY"
+                      data-direction="s"
+                      id="_r_f_"
+                      popover="auto"
                     >
-                      <path
-                        d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                      />
-                    </svg>
-                  </button>
-                  <span
-                    aria-hidden="true"
-                    class="prc-TooltipV2-Tooltip-cYMVY"
-                    data-direction="s"
-                    id="_r_e_"
-                    popover="auto"
-                  >
-                    Show token
+                      Show token
+                    </span>
                   </span>
                 </span>
-              </span>
+              </div>
             </div>
           </div>
-        </div>
-        <div
-          class="left-sidebar bg-gitify-footer"
-        >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="condensed"
-            data-wrap="nowrap"
+            class="left-sidebar bg-gitify-footer"
           >
-            <button
-              aria-describedby="_r_h_-loading-announcement _r_g_"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="small"
-              data-testid="login-docs"
-              data-variant="default"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-book"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
-                >
-                  Docs
-                </span>
-              </span>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="s"
-              id="_r_g_"
-              popover="auto"
-              role="tooltip"
-            >
-              GitHub documentation
-            </span>
             <div
-              data-loading-wrapper="true"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="horizontal"
+              data-justify="space-between"
+              data-padding="condensed"
+              data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_i_-loading-announcement"
+                aria-describedby="_r_i_-loading-announcement _r_h_"
                 class="prc-Button-ButtonBase-c50BI"
                 data-loading="false"
-                data-size="medium"
-                data-testid="login-submit"
-                data-variant="primary"
+                data-size="small"
+                data-testid="login-docs"
+                data-variant="default"
                 type="button"
               >
                 <span
@@ -421,7 +831,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                   >
                     <svg
                       aria-hidden="true"
-                      class="octicon octicon-sign-in"
+                      class="octicon octicon-book"
                       display="inline-block"
                       fill="currentColor"
                       focusable="false"
@@ -432,7 +842,7 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                       width="16"
                     >
                       <path
-                        d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                        d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
                       />
                     </svg>
                   </span>
@@ -440,456 +850,68 @@ exports[`renderer/routes/LoginWithOAuthApp.tsx renders correctly 1`] = `
                     class="prc-Button-Label-pTQ3x"
                     data-component="text"
                   >
-                    Login
+                    Docs
                   </span>
                 </span>
               </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="flex flex-col h-screen"
-      data-testid="Login With OAuth App"
-    >
-      <div
-        class="pl-4 pr-5 pt-3 pb-1"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_0_-loading-announcement"
-            aria-labelledby="Go Back"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="header-nav-back"
-            data-variant="invisible"
-            type="button"
-          >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-arrow-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
-          <legend>
-            <div
-              class="mb-2"
-            >
-              <div
-                class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
-                data-wrap="nowrap"
-                id="title-login-with-oauth-app"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-person"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                  />
-                </svg>
-                <h4
-                  class="prc-Heading-Heading-6CmGO"
-                >
-                  Login with OAuth App
-                </h4>
-              </div>
-            </div>
-          </legend>
-        </div>
-      </div>
-      <div
-        class="grow overflow-x-hidden overflow-y-auto px-5"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="normal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="prc-FormControl-ControlVerticalLayout-wOp8f"
-            data-has-label=""
-          >
-            <label
-              class="prc-components-Label-bE-kK"
-              for="_r_1_"
-            >
-              <span
-                class="prc-components-RequiredText-ztJvt"
-              >
-                <span>
-                  Hostname
-                </span>
-                <span>
-                  *
-                </span>
-              </span>
-            </label>
-            <span
-              aria-busy="false"
-              class="border-gitify-textInput-default TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-              data-block="true"
-            >
-              <input
-                aria-describedby="_r_1_-caption"
-                aria-invalid="false"
-                aria-required="true"
-                class="prc-components-Input-Ic-y8"
-                data-component="input"
-                data-testid="login-hostname"
-                id="_r_1_"
-                name="hostname"
-                placeholder="github.com"
-                type="text"
-                value="github.com"
-              />
-            </span>
-            <span
-              class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
-              id="_r_1_-caption"
-            >
-              <i
-                class="prc-Text-Text-0ima0"
-              >
-                Change only if you are using GitHub Enterprise Server
-              </i>
-            </span>
-          </div>
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="center"
-            data-direction="horizontal"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
-            <button
-              aria-describedby="_r_5_-loading-announcement"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="small"
-              data-testid="login-create-oauth-app"
-              data-variant="default"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-person"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M10.561 8.073a6.005 6.005 0 0 1 3.432 5.142.75.75 0 1 1-1.498.07 4.5 4.5 0 0 0-8.99 0 .75.75 0 0 1-1.498-.07 6.004 6.004 0 0 1 3.431-5.142 3.999 3.999 0 1 1 5.123 0ZM10.5 5a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
-                >
-                  Create new OAuth App
-                </span>
-              </span>
-            </button>
-            <span
-              class="text-xs prc-Text-Text-0ima0"
-            >
-              and use your 
-              <i
-                class="prc-Text-Text-0ima0"
-              >
-                client id & secret
-              </i>
-               below.
-            </span>
-          </div>
-          <div
-            class="prc-FormControl-ControlVerticalLayout-wOp8f"
-            data-has-label=""
-          >
-            <label
-              class="prc-components-Label-bE-kK"
-              for="_r_6_"
-            >
-              <span
-                class="prc-components-RequiredText-ztJvt"
-              >
-                <span>
-                  Client ID
-                </span>
-                <span>
-                  *
-                </span>
-              </span>
-            </label>
-            <span
-              aria-busy="false"
-              class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-              data-block="true"
-            >
-              <input
-                aria-invalid="false"
-                aria-required="true"
-                class="prc-components-Input-Ic-y8"
-                data-component="input"
-                data-testid="login-clientId"
-                id="_r_6_"
-                name="clientId"
-                placeholder="Your generated client id (20 characters)"
-                type="text"
-                value=""
-              />
-            </span>
-          </div>
-          <div
-            class="prc-FormControl-ControlVerticalLayout-wOp8f"
-            data-has-label=""
-          >
-            <label
-              class="prc-components-Label-bE-kK"
-              for="_r_a_"
-            >
               <span
-                class="prc-components-RequiredText-ztJvt"
+                aria-hidden="true"
+                class="prc-TooltipV2-Tooltip-cYMVY"
+                data-direction="s"
+                id="_r_h_"
+                popover="auto"
+                role="tooltip"
               >
-                <span>
-                  Client Secret
-                </span>
-                <span>
-                  *
-                </span>
+                GitHub documentation
               </span>
-            </label>
-            <span
-              aria-busy="false"
-              class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-              data-block="true"
-              data-trailing-action="true"
-            >
-              <input
-                aria-invalid="false"
-                aria-required="true"
-                class="prc-components-Input-Ic-y8"
-                data-component="input"
-                data-testid="login-clientSecret"
-                id="_r_a_"
-                name="clientSecret"
-                placeholder="Your generated client secret (40 characters)"
-                type="password"
-                value=""
-              />
-              <span
-                class="TextInput-action prc-components-TextInputAction-YT3YI"
+              <div
+                data-loading-wrapper="true"
               >
                 <button
-                  aria-describedby="_r_f_-loading-announcement"
-                  aria-labelledby="_r_e_"
-                  class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
-                  data-component="IconButton"
+                  aria-describedby="_r_j_-loading-announcement"
+                  class="prc-Button-ButtonBase-c50BI"
                   data-loading="false"
-                  data-no-visuals="true"
-                  data-size="small"
-                  data-variant="invisible"
+                  data-size="medium"
+                  data-testid="login-submit"
+                  data-variant="primary"
                   type="button"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-eye"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
                   >
-                    <path
-                      d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                    />
-                  </svg>
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-sign-in"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      Login
+                    </span>
+                  </span>
                 </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-cYMVY"
-                  data-direction="s"
-                  id="_r_e_"
-                  popover="auto"
-                >
-                  Show token
-                </span>
-              </span>
-            </span>
-          </div>
-        </div>
-      </div>
-      <div
-        class="left-sidebar bg-gitify-footer"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="condensed"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_h_-loading-announcement _r_g_"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-size="small"
-            data-testid="login-docs"
-            data-variant="default"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                data-component="leadingVisual"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-book"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
-                  />
-                </svg>
-              </span>
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                Docs
-              </span>
-            </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="s"
-            id="_r_g_"
-            popover="auto"
-            role="tooltip"
-          >
-            GitHub documentation
-          </span>
-          <div
-            data-loading-wrapper="true"
-          >
-            <button
-              aria-describedby="_r_i_-loading-announcement"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-submit"
-              data-variant="primary"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-sign-in"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
-                >
-                  Login
-                </span>
-              </span>
-            </button>
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
index 90139820e..aee7a7dd4 100644
--- a/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/LoginWithPersonalAccessToken.test.tsx.snap
@@ -6,66 +6,44 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
   "baseElement": <body>
     <div>
       <div
-        class="flex flex-col h-screen"
-        data-testid="Login With Personal Access Token"
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
       >
         <div
-          class="pl-4 pr-5 pt-3 pb-1"
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="flex flex-col h-screen"
+            data-testid="Login With Personal Access Token"
           >
-            <button
-              aria-describedby="_r_0_-loading-announcement"
-              aria-labelledby="Go Back"
-              class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-              data-component="IconButton"
-              data-loading="false"
-              data-no-visuals="true"
-              data-size="medium"
-              data-testid="header-nav-back"
-              data-variant="invisible"
-              type="button"
+            <div
+              class="pl-4 pr-5 pt-3 pb-1"
             >
-              <svg
-                aria-hidden="true"
-                class="octicon octicon-arrow-left"
-                display="inline-block"
-                fill="currentColor"
-                focusable="false"
-                height="16"
-                overflow="visible"
-                style="vertical-align: text-bottom;"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-                />
-              </svg>
-            </button>
-            <legend>
               <div
-                class="mb-2"
+                class="prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="horizontal"
+                data-justify="space-between"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <div
-                  class="prc-Stack-Stack-WJVsK"
-                  data-align="center"
-                  data-direction="horizontal"
-                  data-gap="condensed"
-                  data-justify="start"
-                  data-padding="none"
-                  data-wrap="nowrap"
-                  id="title-login-with-personal-access-token"
+                <button
+                  aria-describedby="_r_1_-loading-announcement"
+                  aria-labelledby="Go Back"
+                  class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                  data-component="IconButton"
+                  data-loading="false"
+                  data-no-visuals="true"
+                  data-size="medium"
+                  data-testid="header-nav-back"
+                  data-variant="invisible"
+                  type="button"
                 >
                   <svg
                     aria-hidden="true"
-                    class="octicon octicon-key"
+                    class="octicon octicon-arrow-left"
                     display="inline-block"
                     fill="currentColor"
                     focusable="false"
@@ -76,104 +54,306 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     width="16"
                   >
                     <path
-                      d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                      d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
                     />
                   </svg>
-                  <h4
-                    class="prc-Heading-Heading-6CmGO"
+                </button>
+                <legend>
+                  <div
+                    class="mb-2"
                   >
-                    Login with Personal Access Token
-                  </h4>
-                </div>
+                    <div
+                      class="prc-Stack-Stack-WJVsK"
+                      data-align="center"
+                      data-direction="horizontal"
+                      data-gap="condensed"
+                      data-justify="start"
+                      data-padding="none"
+                      data-wrap="nowrap"
+                      id="title-login-with-personal-access-token"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-key"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                        />
+                      </svg>
+                      <h4
+                        class="prc-Heading-Heading-6CmGO"
+                      >
+                        Login with Personal Access Token
+                      </h4>
+                    </div>
+                  </div>
+                </legend>
               </div>
-            </legend>
-          </div>
-        </div>
-        <div
-          class="grow overflow-x-hidden overflow-y-auto px-5"
-        >
-          <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="normal"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
-          >
+            </div>
             <div
-              class="prc-FormControl-ControlVerticalLayout-wOp8f"
-              data-has-label=""
+              class="grow overflow-x-hidden overflow-y-auto px-5"
             >
-              <label
-                class="prc-components-Label-bE-kK"
-                for="_r_1_"
+              <div
+                class="prc-Stack-Stack-WJVsK"
+                data-align="stretch"
+                data-direction="vertical"
+                data-gap="normal"
+                data-justify="start"
+                data-padding="none"
+                data-wrap="nowrap"
               >
-                <span
-                  class="prc-components-RequiredText-ztJvt"
+                <div
+                  class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                  data-has-label=""
                 >
-                  <span>
-                    Hostname
+                  <label
+                    class="prc-components-Label-bE-kK"
+                    for="_r_2_"
+                  >
+                    <span
+                      class="prc-components-RequiredText-ztJvt"
+                    >
+                      <span>
+                        Hostname
+                      </span>
+                      <span>
+                        *
+                      </span>
+                    </span>
+                  </label>
+                  <span
+                    aria-busy="false"
+                    class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                    data-block="true"
+                  >
+                    <input
+                      aria-describedby="_r_2_-caption"
+                      aria-invalid="false"
+                      aria-required="true"
+                      class="prc-components-Input-Ic-y8"
+                      data-component="input"
+                      data-testid="login-hostname"
+                      id="_r_2_"
+                      name="hostname"
+                      placeholder="github.com"
+                      type="text"
+                      value="github.com"
+                    />
                   </span>
-                  <span>
-                    *
+                  <span
+                    class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
+                    id="_r_2_-caption"
+                  >
+                    <i
+                      class="prc-Text-Text-0ima0"
+                    >
+                      Change only if you are using GitHub Enterprise Server
+                    </i>
                   </span>
-                </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-                data-block="true"
-              >
-                <input
-                  aria-describedby="_r_1_-caption"
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-Ic-y8"
-                  data-component="input"
-                  data-testid="login-hostname"
-                  id="_r_1_"
-                  name="hostname"
-                  placeholder="github.com"
-                  type="text"
-                  value="github.com"
-                />
-              </span>
-              <span
-                class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
-                id="_r_1_-caption"
-              >
-                <i
-                  class="prc-Text-Text-0ima0"
+                </div>
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="stretch"
+                  data-direction="vertical"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  Change only if you are using GitHub Enterprise Server
-                </i>
-              </span>
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                  >
+                    <button
+                      aria-describedby="_r_6_-loading-announcement"
+                      class="prc-Button-ButtonBase-c50BI"
+                      data-loading="false"
+                      data-size="small"
+                      data-testid="login-create-token"
+                      data-variant="default"
+                      type="button"
+                    >
+                      <span
+                        class="prc-Button-ButtonContent-HKbr-"
+                        data-align="center"
+                        data-component="buttonContent"
+                      >
+                        <span
+                          class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                          data-component="leadingVisual"
+                        >
+                          <svg
+                            aria-hidden="true"
+                            class="octicon octicon-key"
+                            display="inline-block"
+                            fill="currentColor"
+                            focusable="false"
+                            height="16"
+                            overflow="visible"
+                            style="vertical-align: text-bottom;"
+                            viewBox="0 0 16 16"
+                            width="16"
+                          >
+                            <path
+                              d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                            />
+                          </svg>
+                        </span>
+                        <span
+                          class="prc-Button-Label-pTQ3x"
+                          data-component="text"
+                        >
+                          Generate a PAT
+                        </span>
+                      </span>
+                    </button>
+                    <span
+                      class="text-xs prc-Text-Text-0ima0"
+                    >
+                      on GitHub to paste the token below.
+                    </span>
+                  </div>
+                  <i
+                    class="text-xs prc-Text-Text-0ima0"
+                  >
+                    The
+                     
+                    <button
+                      aria-describedby="_r_7_"
+                      type="button"
+                    >
+                      <u
+                        class="prc-Text-Text-0ima0"
+                      >
+                        required scopes
+                      </u>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-cYMVY"
+                      data-direction="se"
+                      id="_r_7_"
+                      popover="auto"
+                      role="tooltip"
+                    >
+                      read:user, notifications, repo
+                    </span>
+                     
+                    will be automatically selected for you.
+                  </i>
+                </div>
+                <div
+                  class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                  data-has-label=""
+                >
+                  <label
+                    class="prc-components-Label-bE-kK"
+                    for="_r_8_"
+                  >
+                    <span
+                      class="prc-components-RequiredText-ztJvt"
+                    >
+                      <span>
+                        Token
+                      </span>
+                      <span>
+                        *
+                      </span>
+                    </span>
+                  </label>
+                  <span
+                    aria-busy="false"
+                    class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                    data-block="true"
+                    data-trailing-action="true"
+                  >
+                    <input
+                      aria-invalid="false"
+                      aria-required="true"
+                      class="prc-components-Input-Ic-y8"
+                      data-component="input"
+                      data-testid="login-token"
+                      id="_r_8_"
+                      name="token"
+                      placeholder="Your generated token (40 characters)"
+                      type="password"
+                      value=""
+                    />
+                    <span
+                      class="TextInput-action prc-components-TextInputAction-YT3YI"
+                    >
+                      <button
+                        aria-describedby="_r_d_-loading-announcement"
+                        aria-labelledby="_r_c_"
+                        class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
+                        data-component="IconButton"
+                        data-loading="false"
+                        data-no-visuals="true"
+                        data-size="small"
+                        data-variant="invisible"
+                        type="button"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-eye"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="16"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="16"
+                        >
+                          <path
+                            d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+                          />
+                        </svg>
+                      </button>
+                      <span
+                        aria-hidden="true"
+                        class="prc-TooltipV2-Tooltip-cYMVY"
+                        data-direction="s"
+                        id="_r_c_"
+                        popover="auto"
+                      >
+                        Show token
+                      </span>
+                    </span>
+                  </span>
+                </div>
+              </div>
             </div>
             <div
-              class="prc-Stack-Stack-WJVsK"
-              data-align="stretch"
-              data-direction="vertical"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
-              data-wrap="nowrap"
+              class="left-sidebar bg-gitify-footer"
             >
               <div
                 class="prc-Stack-Stack-WJVsK"
-                data-align="center"
+                data-align="stretch"
                 data-direction="horizontal"
-                data-gap="condensed"
-                data-justify="start"
-                data-padding="none"
+                data-justify="space-between"
+                data-padding="condensed"
                 data-wrap="nowrap"
               >
                 <button
-                  aria-describedby="_r_5_-loading-announcement"
+                  aria-describedby="_r_f_-loading-announcement _r_e_"
                   class="prc-Button-ButtonBase-c50BI"
                   data-loading="false"
                   data-size="small"
-                  data-testid="login-create-token"
+                  data-testid="login-docs"
                   data-variant="default"
                   type="button"
                 >
@@ -188,7 +368,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     >
                       <svg
                         aria-hidden="true"
-                        class="octicon octicon-key"
+                        class="octicon octicon-book"
                         display="inline-block"
                         fill="currentColor"
                         focusable="false"
@@ -199,7 +379,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                         width="16"
                       >
                         <path
-                          d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                          d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
                         />
                       </svg>
                     </span>
@@ -207,215 +387,145 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       class="prc-Button-Label-pTQ3x"
                       data-component="text"
                     >
-                      Generate a PAT
+                      Docs
                     </span>
                   </span>
                 </button>
-                <span
-                  class="text-xs prc-Text-Text-0ima0"
-                >
-                  on GitHub to paste the token below.
-                </span>
-              </div>
-              <i
-                class="text-xs prc-Text-Text-0ima0"
-              >
-                The
-                 
-                <button
-                  aria-describedby="_r_6_"
-                  type="button"
-                >
-                  <u
-                    class="prc-Text-Text-0ima0"
-                  >
-                    required scopes
-                  </u>
-                </button>
                 <span
                   aria-hidden="true"
                   class="prc-TooltipV2-Tooltip-cYMVY"
-                  data-direction="se"
-                  id="_r_6_"
+                  data-direction="ne"
+                  id="_r_e_"
                   popover="auto"
                   role="tooltip"
                 >
-                  read:user, notifications, repo
-                </span>
-                 
-                will be automatically selected for you.
-              </i>
-            </div>
-            <div
-              class="prc-FormControl-ControlVerticalLayout-wOp8f"
-              data-has-label=""
-            >
-              <label
-                class="prc-components-Label-bE-kK"
-                for="_r_7_"
-              >
-                <span
-                  class="prc-components-RequiredText-ztJvt"
-                >
-                  <span>
-                    Token
-                  </span>
-                  <span>
-                    *
-                  </span>
+                  GitHub documentation
                 </span>
-              </label>
-              <span
-                aria-busy="false"
-                class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-                data-block="true"
-                data-trailing-action="true"
-              >
-                <input
-                  aria-invalid="false"
-                  aria-required="true"
-                  class="prc-components-Input-Ic-y8"
-                  data-component="input"
-                  data-testid="login-token"
-                  id="_r_7_"
-                  name="token"
-                  placeholder="Your generated token (40 characters)"
-                  type="password"
-                  value=""
-                />
-                <span
-                  class="TextInput-action prc-components-TextInputAction-YT3YI"
+                <div
+                  data-loading-wrapper="true"
                 >
                   <button
-                    aria-describedby="_r_c_-loading-announcement"
-                    aria-labelledby="_r_b_"
-                    class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
-                    data-component="IconButton"
+                    aria-describedby="_r_g_-loading-announcement"
+                    class="prc-Button-ButtonBase-c50BI"
                     data-loading="false"
-                    data-no-visuals="true"
-                    data-size="small"
-                    data-variant="invisible"
+                    data-size="medium"
+                    data-testid="login-submit"
+                    data-variant="primary"
                     type="button"
                   >
-                    <svg
-                      aria-hidden="true"
-                      class="octicon octicon-eye"
-                      display="inline-block"
-                      fill="currentColor"
-                      focusable="false"
-                      height="16"
-                      overflow="visible"
-                      style="vertical-align: text-bottom;"
-                      viewBox="0 0 16 16"
-                      width="16"
+                    <span
+                      class="prc-Button-ButtonContent-HKbr-"
+                      data-align="center"
+                      data-component="buttonContent"
                     >
-                      <path
-                        d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                      />
-                    </svg>
+                      <span
+                        class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                        data-component="leadingVisual"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-sign-in"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="16"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="16"
+                        >
+                          <path
+                            d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                          />
+                        </svg>
+                      </span>
+                      <span
+                        class="prc-Button-Label-pTQ3x"
+                        data-component="text"
+                      >
+                        Login
+                      </span>
+                    </span>
                   </button>
-                  <span
-                    aria-hidden="true"
-                    class="prc-TooltipV2-Tooltip-cYMVY"
-                    data-direction="s"
-                    id="_r_b_"
-                    popover="auto"
-                  >
-                    Show token
-                  </span>
-                </span>
-              </span>
+                </div>
+              </div>
             </div>
           </div>
         </div>
+      </div>
+    </div>
+  </body>,
+  "container": <div>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
         <div
-          class="left-sidebar bg-gitify-footer"
+          class="flex flex-col h-screen"
+          data-testid="Login With Personal Access Token"
         >
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="horizontal"
-            data-justify="space-between"
-            data-padding="condensed"
-            data-wrap="nowrap"
+            class="pl-4 pr-5 pt-3 pb-1"
           >
-            <button
-              aria-describedby="_r_e_-loading-announcement _r_d_"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="small"
-              data-testid="login-docs"
-              data-variant="default"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-book"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
-                >
-                  Docs
-                </span>
-              </span>
-            </button>
-            <span
-              aria-hidden="true"
-              class="prc-TooltipV2-Tooltip-cYMVY"
-              data-direction="ne"
-              id="_r_d_"
-              popover="auto"
-              role="tooltip"
-            >
-              GitHub documentation
-            </span>
             <div
-              data-loading-wrapper="true"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="horizontal"
+              data-justify="space-between"
+              data-padding="none"
+              data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_f_-loading-announcement"
-                class="prc-Button-ButtonBase-c50BI"
+                aria-describedby="_r_1_-loading-announcement"
+                aria-labelledby="Go Back"
+                class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
+                data-component="IconButton"
                 data-loading="false"
+                data-no-visuals="true"
                 data-size="medium"
-                data-testid="login-submit"
-                data-variant="primary"
+                data-testid="header-nav-back"
+                data-variant="invisible"
                 type="button"
               >
-                <span
-                  class="prc-Button-ButtonContent-HKbr-"
-                  data-align="center"
-                  data-component="buttonContent"
+                <svg
+                  aria-hidden="true"
+                  class="octicon octicon-arrow-left"
+                  display="inline-block"
+                  fill="currentColor"
+                  focusable="false"
+                  height="16"
+                  overflow="visible"
+                  style="vertical-align: text-bottom;"
+                  viewBox="0 0 16 16"
+                  width="16"
                 >
-                  <span
-                    class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                    data-component="leadingVisual"
+                  <path
+                    d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
+                  />
+                </svg>
+              </button>
+              <legend>
+                <div
+                  class="mb-2"
+                >
+                  <div
+                    class="prc-Stack-Stack-WJVsK"
+                    data-align="center"
+                    data-direction="horizontal"
+                    data-gap="condensed"
+                    data-justify="start"
+                    data-padding="none"
+                    data-wrap="nowrap"
+                    id="title-login-with-personal-access-token"
                   >
                     <svg
                       aria-hidden="true"
-                      class="octicon octicon-sign-in"
+                      class="octicon octicon-key"
                       display="inline-block"
                       fill="currentColor"
                       focusable="false"
@@ -426,194 +536,275 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       width="16"
                     >
                       <path
-                        d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                        d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
                       />
                     </svg>
-                  </span>
-                  <span
-                    class="prc-Button-Label-pTQ3x"
-                    data-component="text"
-                  >
-                    Login
-                  </span>
-                </span>
-              </button>
+                    <h4
+                      class="prc-Heading-Heading-6CmGO"
+                    >
+                      Login with Personal Access Token
+                    </h4>
+                  </div>
+                </div>
+              </legend>
             </div>
           </div>
-        </div>
-      </div>
-    </div>
-  </body>,
-  "container": <div>
-    <div
-      class="flex flex-col h-screen"
-      data-testid="Login With Personal Access Token"
-    >
-      <div
-        class="pl-4 pr-5 pt-3 pb-1"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_0_-loading-announcement"
-            aria-labelledby="Go Back"
-            class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
-            data-component="IconButton"
-            data-loading="false"
-            data-no-visuals="true"
-            data-size="medium"
-            data-testid="header-nav-back"
-            data-variant="invisible"
-            type="button"
+          <div
+            class="grow overflow-x-hidden overflow-y-auto px-5"
           >
-            <svg
-              aria-hidden="true"
-              class="octicon octicon-arrow-left"
-              display="inline-block"
-              fill="currentColor"
-              focusable="false"
-              height="16"
-              overflow="visible"
-              style="vertical-align: text-bottom;"
-              viewBox="0 0 16 16"
-              width="16"
-            >
-              <path
-                d="M7.78 12.53a.75.75 0 0 1-1.06 0L2.47 8.28a.75.75 0 0 1 0-1.06l4.25-4.25a.751.751 0 0 1 1.042.018.751.751 0 0 1 .018 1.042L4.81 7h7.44a.75.75 0 0 1 0 1.5H4.81l2.97 2.97a.75.75 0 0 1 0 1.06Z"
-              />
-            </svg>
-          </button>
-          <legend>
             <div
-              class="mb-2"
+              class="prc-Stack-Stack-WJVsK"
+              data-align="stretch"
+              data-direction="vertical"
+              data-gap="normal"
+              data-justify="start"
+              data-padding="none"
+              data-wrap="nowrap"
             >
+              <div
+                class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                data-has-label=""
+              >
+                <label
+                  class="prc-components-Label-bE-kK"
+                  for="_r_2_"
+                >
+                  <span
+                    class="prc-components-RequiredText-ztJvt"
+                  >
+                    <span>
+                      Hostname
+                    </span>
+                    <span>
+                      *
+                    </span>
+                  </span>
+                </label>
+                <span
+                  aria-busy="false"
+                  class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                  data-block="true"
+                >
+                  <input
+                    aria-describedby="_r_2_-caption"
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="prc-components-Input-Ic-y8"
+                    data-component="input"
+                    data-testid="login-hostname"
+                    id="_r_2_"
+                    name="hostname"
+                    placeholder="github.com"
+                    type="text"
+                    value="github.com"
+                  />
+                </span>
+                <span
+                  class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
+                  id="_r_2_-caption"
+                >
+                  <i
+                    class="prc-Text-Text-0ima0"
+                  >
+                    Change only if you are using GitHub Enterprise Server
+                  </i>
+                </span>
+              </div>
               <div
                 class="prc-Stack-Stack-WJVsK"
-                data-align="center"
-                data-direction="horizontal"
+                data-align="stretch"
+                data-direction="vertical"
                 data-gap="condensed"
                 data-justify="start"
                 data-padding="none"
                 data-wrap="nowrap"
-                id="title-login-with-personal-access-token"
               >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-key"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
+                <div
+                  class="prc-Stack-Stack-WJVsK"
+                  data-align="center"
+                  data-direction="horizontal"
+                  data-gap="condensed"
+                  data-justify="start"
+                  data-padding="none"
+                  data-wrap="nowrap"
                 >
-                  <path
-                    d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
-                  />
-                </svg>
-                <h4
-                  class="prc-Heading-Heading-6CmGO"
+                  <button
+                    aria-describedby="_r_6_-loading-announcement"
+                    class="prc-Button-ButtonBase-c50BI"
+                    data-loading="false"
+                    data-size="small"
+                    data-testid="login-create-token"
+                    data-variant="default"
+                    type="button"
+                  >
+                    <span
+                      class="prc-Button-ButtonContent-HKbr-"
+                      data-align="center"
+                      data-component="buttonContent"
+                    >
+                      <span
+                        class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                        data-component="leadingVisual"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          class="octicon octicon-key"
+                          display="inline-block"
+                          fill="currentColor"
+                          focusable="false"
+                          height="16"
+                          overflow="visible"
+                          style="vertical-align: text-bottom;"
+                          viewBox="0 0 16 16"
+                          width="16"
+                        >
+                          <path
+                            d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                          />
+                        </svg>
+                      </span>
+                      <span
+                        class="prc-Button-Label-pTQ3x"
+                        data-component="text"
+                      >
+                        Generate a PAT
+                      </span>
+                    </span>
+                  </button>
+                  <span
+                    class="text-xs prc-Text-Text-0ima0"
+                  >
+                    on GitHub to paste the token below.
+                  </span>
+                </div>
+                <i
+                  class="text-xs prc-Text-Text-0ima0"
                 >
-                  Login with Personal Access Token
-                </h4>
+                  The
+                   
+                  <button
+                    aria-describedby="_r_7_"
+                    type="button"
+                  >
+                    <u
+                      class="prc-Text-Text-0ima0"
+                    >
+                      required scopes
+                    </u>
+                  </button>
+                  <span
+                    aria-hidden="true"
+                    class="prc-TooltipV2-Tooltip-cYMVY"
+                    data-direction="se"
+                    id="_r_7_"
+                    popover="auto"
+                    role="tooltip"
+                  >
+                    read:user, notifications, repo
+                  </span>
+                   
+                  will be automatically selected for you.
+                </i>
               </div>
-            </div>
-          </legend>
-        </div>
-      </div>
-      <div
-        class="grow overflow-x-hidden overflow-y-auto px-5"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="vertical"
-          data-gap="normal"
-          data-justify="start"
-          data-padding="none"
-          data-wrap="nowrap"
-        >
-          <div
-            class="prc-FormControl-ControlVerticalLayout-wOp8f"
-            data-has-label=""
-          >
-            <label
-              class="prc-components-Label-bE-kK"
-              for="_r_1_"
-            >
-              <span
-                class="prc-components-RequiredText-ztJvt"
+              <div
+                class="prc-FormControl-ControlVerticalLayout-wOp8f"
+                data-has-label=""
               >
-                <span>
-                  Hostname
-                </span>
-                <span>
-                  *
+                <label
+                  class="prc-components-Label-bE-kK"
+                  for="_r_8_"
+                >
+                  <span
+                    class="prc-components-RequiredText-ztJvt"
+                  >
+                    <span>
+                      Token
+                    </span>
+                    <span>
+                      *
+                    </span>
+                  </span>
+                </label>
+                <span
+                  aria-busy="false"
+                  class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
+                  data-block="true"
+                  data-trailing-action="true"
+                >
+                  <input
+                    aria-invalid="false"
+                    aria-required="true"
+                    class="prc-components-Input-Ic-y8"
+                    data-component="input"
+                    data-testid="login-token"
+                    id="_r_8_"
+                    name="token"
+                    placeholder="Your generated token (40 characters)"
+                    type="password"
+                    value=""
+                  />
+                  <span
+                    class="TextInput-action prc-components-TextInputAction-YT3YI"
+                  >
+                    <button
+                      aria-describedby="_r_d_-loading-announcement"
+                      aria-labelledby="_r_c_"
+                      class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
+                      data-component="IconButton"
+                      data-loading="false"
+                      data-no-visuals="true"
+                      data-size="small"
+                      data-variant="invisible"
+                      type="button"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-eye"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
+                        />
+                      </svg>
+                    </button>
+                    <span
+                      aria-hidden="true"
+                      class="prc-TooltipV2-Tooltip-cYMVY"
+                      data-direction="s"
+                      id="_r_c_"
+                      popover="auto"
+                    >
+                      Show token
+                    </span>
+                  </span>
                 </span>
-              </span>
-            </label>
-            <span
-              aria-busy="false"
-              class="TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-              data-block="true"
-            >
-              <input
-                aria-describedby="_r_1_-caption"
-                aria-invalid="false"
-                aria-required="true"
-                class="prc-components-Input-Ic-y8"
-                data-component="input"
-                data-testid="login-hostname"
-                id="_r_1_"
-                name="hostname"
-                placeholder="github.com"
-                type="text"
-                value="github.com"
-              />
-            </span>
-            <span
-              class="prc-FormControl-Caption-tfuKU prc-Text-Text-0ima0"
-              id="_r_1_-caption"
-            >
-              <i
-                class="prc-Text-Text-0ima0"
-              >
-                Change only if you are using GitHub Enterprise Server
-              </i>
-            </span>
+              </div>
+            </div>
           </div>
           <div
-            class="prc-Stack-Stack-WJVsK"
-            data-align="stretch"
-            data-direction="vertical"
-            data-gap="condensed"
-            data-justify="start"
-            data-padding="none"
-            data-wrap="nowrap"
+            class="left-sidebar bg-gitify-footer"
           >
             <div
               class="prc-Stack-Stack-WJVsK"
-              data-align="center"
+              data-align="stretch"
               data-direction="horizontal"
-              data-gap="condensed"
-              data-justify="start"
-              data-padding="none"
+              data-justify="space-between"
+              data-padding="condensed"
               data-wrap="nowrap"
             >
               <button
-                aria-describedby="_r_5_-loading-announcement"
+                aria-describedby="_r_f_-loading-announcement _r_e_"
                 class="prc-Button-ButtonBase-c50BI"
                 data-loading="false"
                 data-size="small"
-                data-testid="login-create-token"
+                data-testid="login-docs"
                 data-variant="default"
                 type="button"
               >
@@ -628,7 +819,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                   >
                     <svg
                       aria-hidden="true"
-                      class="octicon octicon-key"
+                      class="octicon octicon-book"
                       display="inline-block"
                       fill="currentColor"
                       focusable="false"
@@ -639,7 +830,7 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                       width="16"
                     >
                       <path
-                        d="M10.5 0a5.499 5.499 0 1 1-1.288 10.848l-.932.932a.749.749 0 0 1-.53.22H7v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22H5v.75a.749.749 0 0 1-.22.53l-.5.5a.749.749 0 0 1-.53.22h-2A1.75 1.75 0 0 1 0 14.25v-2c0-.199.079-.389.22-.53l4.932-4.932A5.5 5.5 0 0 1 10.5 0Zm-4 5.5c-.001.431.069.86.205 1.269a.75.75 0 0 1-.181.768L1.5 12.56v1.69c0 .138.112.25.25.25h1.69l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l.06-.06v-1.19a.75.75 0 0 1 .75-.75h1.19l1.023-1.025a.75.75 0 0 1 .768-.18A4 4 0 1 0 6.5 5.5ZM11 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2Z"
+                        d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
                       />
                     </svg>
                   </span>
@@ -647,237 +838,68 @@ exports[`renderer/routes/LoginWithPersonalAccessToken.tsx renders correctly 1`]
                     class="prc-Button-Label-pTQ3x"
                     data-component="text"
                   >
-                    Generate a PAT
+                    Docs
                   </span>
                 </span>
               </button>
-              <span
-                class="text-xs prc-Text-Text-0ima0"
-              >
-                on GitHub to paste the token below.
-              </span>
-            </div>
-            <i
-              class="text-xs prc-Text-Text-0ima0"
-            >
-              The
-               
-              <button
-                aria-describedby="_r_6_"
-                type="button"
-              >
-                <u
-                  class="prc-Text-Text-0ima0"
-                >
-                  required scopes
-                </u>
-              </button>
               <span
                 aria-hidden="true"
                 class="prc-TooltipV2-Tooltip-cYMVY"
-                data-direction="se"
-                id="_r_6_"
+                data-direction="ne"
+                id="_r_e_"
                 popover="auto"
                 role="tooltip"
               >
-                read:user, notifications, repo
+                GitHub documentation
               </span>
-               
-              will be automatically selected for you.
-            </i>
-          </div>
-          <div
-            class="prc-FormControl-ControlVerticalLayout-wOp8f"
-            data-has-label=""
-          >
-            <label
-              class="prc-components-Label-bE-kK"
-              for="_r_7_"
-            >
-              <span
-                class="prc-components-RequiredText-ztJvt"
-              >
-                <span>
-                  Token
-                </span>
-                <span>
-                  *
-                </span>
-              </span>
-            </label>
-            <span
-              aria-busy="false"
-              class="border-red-600 TextInput-wrapper prc-components-TextInputWrapper-i1ofR prc-components-TextInputBaseWrapper-ueK9q"
-              data-block="true"
-              data-trailing-action="true"
-            >
-              <input
-                aria-invalid="false"
-                aria-required="true"
-                class="prc-components-Input-Ic-y8"
-                data-component="input"
-                data-testid="login-token"
-                id="_r_7_"
-                name="token"
-                placeholder="Your generated token (40 characters)"
-                type="password"
-                value=""
-              />
-              <span
-                class="TextInput-action prc-components-TextInputAction-YT3YI"
+              <div
+                data-loading-wrapper="true"
               >
                 <button
-                  aria-describedby="_r_c_-loading-announcement"
-                  aria-labelledby="_r_b_"
-                  class="prc-Button-ButtonBase-c50BI prc-components-Invisible-uIWry prc-Button-IconButton-szpyj"
-                  data-component="IconButton"
+                  aria-describedby="_r_g_-loading-announcement"
+                  class="prc-Button-ButtonBase-c50BI"
                   data-loading="false"
-                  data-no-visuals="true"
-                  data-size="small"
-                  data-variant="invisible"
+                  data-size="medium"
+                  data-testid="login-submit"
+                  data-variant="primary"
                   type="button"
                 >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-eye"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
+                  <span
+                    class="prc-Button-ButtonContent-HKbr-"
+                    data-align="center"
+                    data-component="buttonContent"
                   >
-                    <path
-                      d="M8 2c1.981 0 3.671.992 4.933 2.078 1.27 1.091 2.187 2.345 2.637 3.023a1.62 1.62 0 0 1 0 1.798c-.45.678-1.367 1.932-2.637 3.023C11.67 13.008 9.981 14 8 14c-1.981 0-3.671-.992-4.933-2.078C1.797 10.83.88 9.576.43 8.898a1.62 1.62 0 0 1 0-1.798c.45-.677 1.367-1.931 2.637-3.022C4.33 2.992 6.019 2 8 2ZM1.679 7.932a.12.12 0 0 0 0 .136c.411.622 1.241 1.75 2.366 2.717C5.176 11.758 6.527 12.5 8 12.5c1.473 0 2.825-.742 3.955-1.715 1.124-.967 1.954-2.096 2.366-2.717a.12.12 0 0 0 0-.136c-.412-.621-1.242-1.75-2.366-2.717C10.824 4.242 9.473 3.5 8 3.5c-1.473 0-2.825.742-3.955 1.715-1.124.967-1.954 2.096-2.366 2.717ZM8 10a2 2 0 1 1-.001-3.999A2 2 0 0 1 8 10Z"
-                    />
-                  </svg>
+                    <span
+                      class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
+                      data-component="leadingVisual"
+                    >
+                      <svg
+                        aria-hidden="true"
+                        class="octicon octicon-sign-in"
+                        display="inline-block"
+                        fill="currentColor"
+                        focusable="false"
+                        height="16"
+                        overflow="visible"
+                        style="vertical-align: text-bottom;"
+                        viewBox="0 0 16 16"
+                        width="16"
+                      >
+                        <path
+                          d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
+                        />
+                      </svg>
+                    </span>
+                    <span
+                      class="prc-Button-Label-pTQ3x"
+                      data-component="text"
+                    >
+                      Login
+                    </span>
+                  </span>
                 </button>
-                <span
-                  aria-hidden="true"
-                  class="prc-TooltipV2-Tooltip-cYMVY"
-                  data-direction="s"
-                  id="_r_b_"
-                  popover="auto"
-                >
-                  Show token
-                </span>
-              </span>
-            </span>
-          </div>
-        </div>
-      </div>
-      <div
-        class="left-sidebar bg-gitify-footer"
-      >
-        <div
-          class="prc-Stack-Stack-WJVsK"
-          data-align="stretch"
-          data-direction="horizontal"
-          data-justify="space-between"
-          data-padding="condensed"
-          data-wrap="nowrap"
-        >
-          <button
-            aria-describedby="_r_e_-loading-announcement _r_d_"
-            class="prc-Button-ButtonBase-c50BI"
-            data-loading="false"
-            data-size="small"
-            data-testid="login-docs"
-            data-variant="default"
-            type="button"
-          >
-            <span
-              class="prc-Button-ButtonContent-HKbr-"
-              data-align="center"
-              data-component="buttonContent"
-            >
-              <span
-                class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                data-component="leadingVisual"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="octicon octicon-book"
-                  display="inline-block"
-                  fill="currentColor"
-                  focusable="false"
-                  height="16"
-                  overflow="visible"
-                  style="vertical-align: text-bottom;"
-                  viewBox="0 0 16 16"
-                  width="16"
-                >
-                  <path
-                    d="M0 1.75A.75.75 0 0 1 .75 1h4.253c1.227 0 2.317.59 3 1.501A3.743 3.743 0 0 1 11.006 1h4.245a.75.75 0 0 1 .75.75v10.5a.75.75 0 0 1-.75.75h-4.507a2.25 2.25 0 0 0-1.591.659l-.622.621a.75.75 0 0 1-1.06 0l-.622-.621A2.25 2.25 0 0 0 5.258 13H.75a.75.75 0 0 1-.75-.75Zm7.251 10.324.004-5.073-.002-2.253A2.25 2.25 0 0 0 5.003 2.5H1.5v9h3.757a3.75 3.75 0 0 1 1.994.574ZM8.755 4.75l-.004 7.322a3.752 3.752 0 0 1 1.992-.572H14.5v-9h-3.495a2.25 2.25 0 0 0-2.25 2.25Z"
-                  />
-                </svg>
-              </span>
-              <span
-                class="prc-Button-Label-pTQ3x"
-                data-component="text"
-              >
-                Docs
-              </span>
-            </span>
-          </button>
-          <span
-            aria-hidden="true"
-            class="prc-TooltipV2-Tooltip-cYMVY"
-            data-direction="ne"
-            id="_r_d_"
-            popover="auto"
-            role="tooltip"
-          >
-            GitHub documentation
-          </span>
-          <div
-            data-loading-wrapper="true"
-          >
-            <button
-              aria-describedby="_r_f_-loading-announcement"
-              class="prc-Button-ButtonBase-c50BI"
-              data-loading="false"
-              data-size="medium"
-              data-testid="login-submit"
-              data-variant="primary"
-              type="button"
-            >
-              <span
-                class="prc-Button-ButtonContent-HKbr-"
-                data-align="center"
-                data-component="buttonContent"
-              >
-                <span
-                  class="prc-Button-Visual-2epfX prc-Button-VisualWrap-Db-eB"
-                  data-component="leadingVisual"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="octicon octicon-sign-in"
-                    display="inline-block"
-                    fill="currentColor"
-                    focusable="false"
-                    height="16"
-                    overflow="visible"
-                    style="vertical-align: text-bottom;"
-                    viewBox="0 0 16 16"
-                    width="16"
-                  >
-                    <path
-                      d="M2 2.75C2 1.784 2.784 1 3.75 1h2.5a.75.75 0 0 1 0 1.5h-2.5a.25.25 0 0 0-.25.25v10.5c0 .138.112.25.25.25h2.5a.75.75 0 0 1 0 1.5h-2.5A1.75 1.75 0 0 1 2 13.25Zm6.56 4.5h5.69a.75.75 0 0 1 0 1.5H8.56l1.97 1.97a.749.749 0 0 1-.326 1.275.749.749 0 0 1-.734-.215L6.22 8.53a.75.75 0 0 1 0-1.06l3.25-3.25a.749.749 0 0 1 1.275.326.749.749 0 0 1-.215.734Z"
-                    />
-                  </svg>
-                </span>
-                <span
-                  class="prc-Button-Label-pTQ3x"
-                  data-component="text"
-                >
-                  Login
-                </span>
-              </span>
-            </button>
+              </div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap b/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap
index e2500c2b2..c5fbe4781 100644
--- a/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Notifications.test.tsx.snap
@@ -5,15 +5,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        AllRead
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            AllRead
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      AllRead
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          AllRead
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -74,15 +96,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        Oops
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            Oops
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      Oops
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          Oops
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -143,15 +187,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        Oops
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            Oops
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      Oops
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          Oops
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -212,15 +278,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        Oops
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            Oops
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      Oops
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          Oops
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -281,15 +369,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        Oops
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            Oops
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      Oops
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          Oops
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -350,15 +460,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        Oops
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            Oops
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      Oops
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          Oops
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -419,15 +551,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        AllRead
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            AllRead
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      AllRead
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          AllRead
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
@@ -488,15 +642,37 @@ exports[`renderer/routes/Notifications.tsx should render itself & its children (
   "asFragment": [Function],
   "baseElement": <body>
     <div>
-      <p>
-        AllRead
-      </p>
+      <div
+        data-color-mode="light"
+        data-dark-theme="dark"
+        data-light-theme="light"
+      >
+        <div
+          class="prc-src-BaseStyles-dl-St"
+          data-portal-root="true"
+        >
+          <p>
+            AllRead
+          </p>
+        </div>
+      </div>
     </div>
   </body>,
   "container": <div>
-    <p>
-      AllRead
-    </p>
+    <div
+      data-color-mode="light"
+      data-dark-theme="dark"
+      data-light-theme="light"
+    >
+      <div
+        class="prc-src-BaseStyles-dl-St"
+        data-portal-root="true"
+      >
+        <p>
+          AllRead
+        </p>
+      </div>
+    </div>
   </div>,
   "debug": [Function],
   "findAllByAltText": [Function],
diff --git a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
index fc1029368..8654c70bf 100644
--- a/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
+++ b/src/renderer/routes/__snapshots__/Settings.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
       data-wrap="nowrap"
     >
       <button
-        aria-describedby="_r_0_-loading-announcement"
+        aria-describedby="_r_1_-loading-announcement"
         aria-labelledby="Go Back"
         class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
         data-component="IconButton"
@@ -304,7 +304,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <div>
                 <button
-                  aria-describedby="_r_2_-loading-announcement"
+                  aria-describedby="_r_3_-loading-announcement"
                   aria-label="Zoom out"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -338,7 +338,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_3_-loading-announcement"
+                  aria-describedby="_r_4_-loading-announcement"
                   aria-label="Zoom percentage"
                   class="prc-Button-ButtonBase-c50BI"
                   data-loading="false"
@@ -365,7 +365,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_4_-loading-announcement"
+                  aria-describedby="_r_5_-loading-announcement"
                   aria-label="Zoom in"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -399,7 +399,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_5_-loading-announcement"
+                  aria-describedby="_r_6_-loading-announcement"
                   aria-label="Reset zoom"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -730,7 +730,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <div>
                 <button
-                  aria-describedby="_r_9_-loading-announcement"
+                  aria-describedby="_r_a_-loading-announcement"
                   aria-label="Decrease fetch interval"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -761,7 +761,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_a_-loading-announcement"
+                  aria-describedby="_r_b_-loading-announcement"
                   aria-label="Fetch interval"
                   class="prc-Button-ButtonBase-c50BI"
                   data-loading="false"
@@ -787,7 +787,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_b_-loading-announcement"
+                  aria-describedby="_r_c_-loading-announcement"
                   aria-label="Increase fetch interval"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -818,7 +818,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_c_-loading-announcement"
+                  aria-describedby="_r_d_-loading-announcement"
                   aria-label="Reset fetch interval"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -1727,7 +1727,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
             >
               <div>
                 <button
-                  aria-describedby="_r_r_-loading-announcement"
+                  aria-describedby="_r_s_-loading-announcement"
                   aria-label="Volume down"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -1763,7 +1763,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_s_-loading-announcement"
+                  aria-describedby="_r_t_-loading-announcement"
                   aria-label="Volume percentage"
                   class="prc-Button-ButtonBase-c50BI"
                   data-loading="false"
@@ -1790,7 +1790,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_t_-loading-announcement"
+                  aria-describedby="_r_u_-loading-announcement"
                   aria-label="Volume up"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -1822,7 +1822,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
               </div>
               <div>
                 <button
-                  aria-describedby="_r_u_-loading-announcement"
+                  aria-describedby="_r_v_-loading-announcement"
                   aria-label="Reset volume"
                   class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
                   data-component="IconButton"
@@ -1912,7 +1912,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_10_-loading-announcement"
+          aria-describedby="_r_11_-loading-announcement"
           class="prc-Button-ButtonBase-c50BI w-[200px]"
           data-loading="false"
           data-no-visuals="true"
@@ -1957,7 +1957,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_12_-loading-announcement _r_11_"
+          aria-describedby="_r_13_-loading-announcement _r_12_"
           class="prc-Button-ButtonBase-c50BI"
           data-loading="false"
           data-no-visuals="true"
@@ -1985,7 +1985,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-cYMVY"
           data-direction="ne"
-          id="_r_11_"
+          id="_r_12_"
           popover="auto"
           role="tooltip"
         >
@@ -2002,7 +2002,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
         data-wrap="nowrap"
       >
         <button
-          aria-describedby="_r_14_-loading-announcement _r_13_"
+          aria-describedby="_r_15_-loading-announcement _r_14_"
           aria-label="Accounts"
           class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
           data-component="IconButton"
@@ -2034,14 +2034,14 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-cYMVY"
           data-direction="n"
-          id="_r_13_"
+          id="_r_14_"
           popover="auto"
           role="tooltip"
         >
           Accounts
         </span>
         <button
-          aria-describedby="_r_16_-loading-announcement _r_15_"
+          aria-describedby="_r_17_-loading-announcement _r_16_"
           aria-label="Quit Gitify"
           class="prc-Button-ButtonBase-c50BI prc-Button-IconButton-szpyj"
           data-component="IconButton"
@@ -2073,7 +2073,7 @@ exports[`renderer/routes/Settings.tsx should render itself & its children 1`] =
           aria-hidden="true"
           class="prc-TooltipV2-Tooltip-cYMVY"
           data-direction="nw"
-          id="_r_15_"
+          id="_r_16_"
           popover="auto"
           role="tooltip"
         >
diff --git a/src/renderer/utils/api/__mocks__/response-mocks.ts b/src/renderer/utils/api/__mocks__/response-mocks.ts
index 2b79c20d3..d1db2fb7b 100644
--- a/src/renderer/utils/api/__mocks__/response-mocks.ts
+++ b/src/renderer/utils/api/__mocks__/response-mocks.ts
@@ -1,7 +1,7 @@
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
-} from '../../../__mocks__/state-mocks';
+} from '../../../__mocks__/account-mocks';
 import type { Link } from '../../../types';
 import type {
   Discussion,
diff --git a/src/renderer/utils/api/client.test.ts b/src/renderer/utils/api/client.test.ts
index 2c32a393e..92ca0319e 100644
--- a/src/renderer/utils/api/client.test.ts
+++ b/src/renderer/utils/api/client.test.ts
@@ -1,6 +1,7 @@
 import axios, { type AxiosPromise, type AxiosResponse } from 'axios';
 
-import { mockGitHubCloudAccount, mockToken } from '../../__mocks__/state-mocks';
+import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
+import { mockToken } from '../../__mocks__/state-mocks';
 import type { Hostname, Link, SettingsState, Token } from '../../types';
 import * as logger from '../../utils/logger';
 import {
@@ -135,7 +136,7 @@ describe('renderer/utils/api/client.ts', () => {
 
   describe('getHtmlUrl', () => {
     it('should return the HTML URL', async () => {
-      const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
+      const mockApiRequestAuth = jest.spyOn(apiRequests, 'apiRequestAuth');
 
       const requestPromise = new Promise((resolve) =>
         resolve({
@@ -146,7 +147,7 @@ describe('renderer/utils/api/client.ts', () => {
         } as AxiosResponse),
       ) as AxiosPromise;
 
-      apiRequestAuthMock.mockResolvedValue(requestPromise);
+      mockApiRequestAuth.mockResolvedValue(requestPromise);
 
       const result = await getHtmlUrl(
         'https://api.github.com/repos/gitify-app/notifications-test/issues/785' as Link,
@@ -162,11 +163,11 @@ describe('renderer/utils/api/client.ts', () => {
         .spyOn(logger, 'rendererLogError')
         .mockImplementation();
 
-      const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
+      const mockApiRequestAuth = jest.spyOn(apiRequests, 'apiRequestAuth');
 
       const mockError = new Error('Test error');
 
-      apiRequestAuthMock.mockRejectedValue(mockError);
+      mockApiRequestAuth.mockRejectedValue(mockError);
 
       await getHtmlUrl(
         'https://api.github.com/repos/gitify-app/gitify/issues/785' as Link,
diff --git a/src/renderer/utils/auth/utils.test.ts b/src/renderer/utils/auth/utils.test.ts
index 71c193de4..cd370a01d 100644
--- a/src/renderer/utils/auth/utils.test.ts
+++ b/src/renderer/utils/auth/utils.test.ts
@@ -2,11 +2,9 @@ import type { AxiosPromise, AxiosResponse } from 'axios';
 import axios from 'axios';
 import nock from 'nock';
 
-import {
-  mockAuth,
-  mockGitHubCloudAccount,
-  mockGitifyUser,
-} from '../../__mocks__/state-mocks';
+import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
+import { mockAuth } from '../../__mocks__/state-mocks';
+import { mockGitifyUser } from '../../__mocks__/user-mocks';
 import type {
   Account,
   AuthCode,
@@ -24,7 +22,7 @@ import { getNewOAuthAppURL, getNewTokenURL } from './utils';
 
 describe('renderer/utils/auth/utils.ts', () => {
   describe('authGitHub', () => {
-    const openExternalLinkMock = jest
+    const mockOpenExternalLink = jest
       .spyOn(comms, 'openExternalLink')
       .mockImplementation();
 
@@ -41,8 +39,8 @@ describe('renderer/utils/auth/utils.ts', () => {
 
       const res = await auth.authGitHub();
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/login/oauth/authorize?client_id=FAKE_CLIENT_ID_123&scope=read%3Auser%2Cnotifications%2Crepo',
       );
 
@@ -68,8 +66,8 @@ describe('renderer/utils/auth/utils.ts', () => {
         hostname: 'my.git.com' as Hostname,
       });
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://my.git.com/login/oauth/authorize?client_id=BYO_CLIENT_ID&scope=read%3Auser%2Cnotifications%2Crepo',
       );
 
@@ -97,8 +95,8 @@ describe('renderer/utils/auth/utils.ts', () => {
         ),
       );
 
-      expect(openExternalLinkMock).toHaveBeenCalledTimes(1);
-      expect(openExternalLinkMock).toHaveBeenCalledWith(
+      expect(mockOpenExternalLink).toHaveBeenCalledTimes(1);
+      expect(mockOpenExternalLink).toHaveBeenCalledWith(
         'https://github.com/login/oauth/authorize?client_id=FAKE_CLIENT_ID_123&scope=read%3Auser%2Cnotifications%2Crepo',
       );
 
@@ -111,14 +109,14 @@ describe('renderer/utils/auth/utils.ts', () => {
 
   describe('getToken', () => {
     const authCode = '123-456' as AuthCode;
-    const apiRequestMock = jest.spyOn(apiRequests, 'apiRequest');
+    const mockApiRequest = jest.spyOn(apiRequests, 'apiRequest');
 
     it('should get a token - success', async () => {
       const requestPromise = new Promise((resolve) =>
         resolve({ data: { access_token: 'this-is-a-token' } } as AxiosResponse),
       ) as AxiosPromise;
 
-      apiRequestMock.mockResolvedValueOnce(requestPromise);
+      mockApiRequest.mockResolvedValueOnce(requestPromise);
 
       const res = await auth.getToken(authCode);
 
@@ -142,7 +140,7 @@ describe('renderer/utils/auth/utils.ts', () => {
         reject({ data: { message } } as AxiosResponse),
       ) as AxiosPromise;
 
-      apiRequestMock.mockResolvedValueOnce(requestPromise);
+      mockApiRequest.mockResolvedValueOnce(requestPromise);
 
       const call = async () => await auth.getToken(authCode);
 
diff --git a/src/renderer/utils/errors.test.ts b/src/renderer/utils/errors.test.ts
index ad39852a1..87c58a912 100644
--- a/src/renderer/utils/errors.test.ts
+++ b/src/renderer/utils/errors.test.ts
@@ -1,4 +1,4 @@
-import { mockAccountWithError } from '../__mocks__/notifications-mocks';
+import { mockAccountWithError } from '../__mocks__/account-mocks';
 import type { AccountNotifications } from '../types';
 import {
   areAllAccountErrorsSame,
diff --git a/src/renderer/utils/features.test.ts b/src/renderer/utils/features.test.ts
index 1e80adf33..7d8786958 100644
--- a/src/renderer/utils/features.test.ts
+++ b/src/renderer/utils/features.test.ts
@@ -1,7 +1,7 @@
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
-} from '../__mocks__/state-mocks';
+} from '../__mocks__/account-mocks';
 import {
   isAnsweredDiscussionFeatureSupported,
   isMarkAsDoneFeatureSupported,
diff --git a/src/renderer/utils/helpers.test.ts b/src/renderer/utils/helpers.test.ts
index c1b64eee8..c7b1c963c 100644
--- a/src/renderer/utils/helpers.test.ts
+++ b/src/renderer/utils/helpers.test.ts
@@ -6,7 +6,7 @@ import {
 
 import type { AxiosPromise, AxiosResponse } from 'axios';
 
-import { mockPersonalAccessTokenAccount } from '../__mocks__/state-mocks';
+import { mockPersonalAccessTokenAccount } from '../__mocks__/account-mocks';
 import type { Hostname, Link } from '../types';
 import type { SubjectType } from '../typesGitHub';
 import * as logger from '../utils/logger';
@@ -74,7 +74,7 @@ describe('renderer/utils/helpers.ts', () => {
       'https://github.com/gitify-app/notifications-test/issues/785';
     const mockNotificationReferrer =
       'notification_referrer_id=MDE4Ok5vdGlmaWNhdGlvblRocmVhZDEzODY2MTA5NjoxMjM0NTY3ODk%3D';
-    const apiRequestAuthMock = jest.spyOn(apiRequests, 'apiRequestAuth');
+    const mockApiRequestAuth = jest.spyOn(apiRequests, 'apiRequestAuth');
 
     afterEach(() => {
       jest.clearAllMocks();
@@ -97,15 +97,15 @@ describe('renderer/utils/helpers.ts', () => {
         } as AxiosResponse),
       ) as AxiosPromise;
 
-      apiRequestAuthMock.mockResolvedValue(requestPromise);
+      mockApiRequestAuth.mockResolvedValue(requestPromise);
 
       const result = await generateGitHubWebUrl({
         ...mockSingleNotification,
         subject: subject,
       });
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
-      expect(apiRequestAuthMock).toHaveBeenCalledWith(
+      expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
+      expect(mockApiRequestAuth).toHaveBeenCalledWith(
         subject.latest_comment_url,
         'GET',
         mockPersonalAccessTokenAccount.token,
@@ -129,15 +129,15 @@ describe('renderer/utils/helpers.ts', () => {
         } as AxiosResponse),
       ) as AxiosPromise;
 
-      apiRequestAuthMock.mockResolvedValue(requestPromise);
+      mockApiRequestAuth.mockResolvedValue(requestPromise);
 
       const result = await generateGitHubWebUrl({
         ...mockSingleNotification,
         subject: subject,
       });
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
-      expect(apiRequestAuthMock).toHaveBeenCalledWith(
+      expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
+      expect(mockApiRequestAuth).toHaveBeenCalledWith(
         subject.url,
         'GET',
         mockPersonalAccessTokenAccount.token,
@@ -159,7 +159,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Asuccess+branch%3Amain&${mockNotificationReferrer}`,
         );
@@ -178,7 +178,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Afailure+branch%3Amain&${mockNotificationReferrer}`,
         );
@@ -197,7 +197,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Afailure+branch%3Amain&${mockNotificationReferrer}`,
         );
@@ -216,7 +216,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+is%3Askipped+branch%3Amain&${mockNotificationReferrer}`,
         );
@@ -235,7 +235,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?${mockNotificationReferrer}`,
         );
@@ -254,7 +254,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?query=workflow%3A%22Demo%22+branch%3Amain&${mockNotificationReferrer}`,
         );
@@ -273,7 +273,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?${mockNotificationReferrer}`,
         );
@@ -295,14 +295,14 @@ describe('renderer/utils/helpers.ts', () => {
           } as AxiosResponse),
         ) as AxiosPromise;
 
-        apiRequestAuthMock.mockResolvedValue(requestPromise);
+        mockApiRequestAuth.mockResolvedValue(requestPromise);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
         expect(result).toBe(
           `${mockSingleNotification.repository.html_url}/discussions?${mockNotificationReferrer}`,
         );
@@ -324,14 +324,14 @@ describe('renderer/utils/helpers.ts', () => {
           } as AxiosResponse),
         ) as AxiosPromise;
 
-        apiRequestAuthMock.mockResolvedValue(requestPromise);
+        mockApiRequestAuth.mockResolvedValue(requestPromise);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/discussions/612?${mockNotificationReferrer}#discussioncomment-2300902`,
         );
@@ -349,14 +349,14 @@ describe('renderer/utils/helpers.ts', () => {
           resolve(null as AxiosResponse),
         ) as AxiosPromise;
 
-        apiRequestAuthMock.mockResolvedValue(requestPromise);
+        mockApiRequestAuth.mockResolvedValue(requestPromise);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/discussions?${mockNotificationReferrer}`,
         );
@@ -377,7 +377,7 @@ describe('renderer/utils/helpers.ts', () => {
         subject: subject,
       });
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+      expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
       expect(result).toBe(
         `https://github.com/gitify-app/notifications-test/invitations?${mockNotificationReferrer}`,
       );
@@ -396,7 +396,7 @@ describe('renderer/utils/helpers.ts', () => {
         subject: subject,
       });
 
-      expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+      expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
       expect(result).toBe(
         `https://github.com/gitify-app/notifications-test/security/dependabot?${mockNotificationReferrer}`,
       );
@@ -416,7 +416,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?query=is%3Awaiting&${mockNotificationReferrer}`,
         );
@@ -436,7 +436,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?${mockNotificationReferrer}`,
         );
@@ -455,7 +455,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `https://github.com/gitify-app/notifications-test/actions?${mockNotificationReferrer}`,
         );
@@ -476,7 +476,7 @@ describe('renderer/utils/helpers.ts', () => {
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(0);
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(0);
         expect(result).toBe(
           `${mockSingleNotification.repository.html_url}?${mockNotificationReferrer}`,
         );
@@ -497,15 +497,15 @@ describe('renderer/utils/helpers.ts', () => {
 
         const mockError = new Error('Test error');
 
-        apiRequestAuthMock.mockRejectedValue(mockError);
+        mockApiRequestAuth.mockRejectedValue(mockError);
 
         const result = await generateGitHubWebUrl({
           ...mockSingleNotification,
           subject: subject,
         });
 
-        expect(apiRequestAuthMock).toHaveBeenCalledTimes(1);
-        expect(apiRequestAuthMock).toHaveBeenCalledWith(
+        expect(mockApiRequestAuth).toHaveBeenCalledTimes(1);
+        expect(mockApiRequestAuth).toHaveBeenCalledWith(
           subject.latest_comment_url,
           'GET',
           mockPersonalAccessTokenAccount.token,
diff --git a/src/renderer/utils/links.test.ts b/src/renderer/utils/links.test.ts
index b2d385aa9..80ed81f25 100644
--- a/src/renderer/utils/links.test.ts
+++ b/src/renderer/utils/links.test.ts
@@ -1,5 +1,5 @@
-import { partialMockUser } from '../__mocks__/partial-mocks';
-import { mockGitHubCloudAccount } from '../__mocks__/state-mocks';
+import { mockGitHubCloudAccount } from '../__mocks__/account-mocks';
+import { createPartialMockUser } from '../__mocks__/user-mocks';
 import { Constants } from '../constants';
 import type { Hostname, Link } from '../types';
 import type { Repository } from '../typesGitHub';
@@ -22,7 +22,7 @@ import {
 } from './links';
 
 describe('renderer/utils/links.ts', () => {
-  const openExternalLinkMock = jest
+  const mockOpenExternalLink = jest
     .spyOn(comms, 'openExternalLink')
     .mockImplementation();
 
@@ -32,50 +32,50 @@ describe('renderer/utils/links.ts', () => {
 
   it('openGitifyReleaseNotes', () => {
     openGitifyReleaseNotes('v1.0.0');
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/gitify-app/gitify/releases/tag/v1.0.0',
     );
   });
 
   it('openGitHubNotifications', () => {
     openGitHubNotifications(mockGitHubCloudAccount.hostname);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/notifications',
     );
   });
 
   it('openGitHubIssues', () => {
     openGitHubIssues(mockGitHubCloudAccount.hostname);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/issues',
     );
   });
 
   it('openGitHubPulls', () => {
     openGitHubPulls(mockGitHubCloudAccount.hostname);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/pulls',
     );
   });
 
   it('openAccountProfile', () => {
     openAccountProfile(mockGitHubCloudAccount);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/octocat',
     );
   });
 
   it('openUserProfile', () => {
-    const mockUser = partialMockUser('mock-user');
+    const mockUser = createPartialMockUser('mock-user');
     openUserProfile(mockUser);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       'https://github.com/mock-user',
     );
   });
 
   it('openHost', () => {
     openHost('github.com' as Hostname);
-    expect(openExternalLinkMock).toHaveBeenCalledWith('https://github.com');
+    expect(mockOpenExternalLink).toHaveBeenCalledWith('https://github.com');
   });
 
   it('openDeveloperSettings', () => {
@@ -85,7 +85,7 @@ describe('renderer/utils/links.ts', () => {
       .spyOn(authUtils, 'getDeveloperSettingsURL')
       .mockReturnValue(mockSettingsURL);
     openDeveloperSettings(mockGitHubCloudAccount);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(mockSettingsURL);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(mockSettingsURL);
   });
 
   it('openRepository', () => {
@@ -96,7 +96,7 @@ describe('renderer/utils/links.ts', () => {
     } as Repository;
 
     openRepository(repo);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(mockHtmlUrl);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(mockHtmlUrl);
   });
 
   it('openNotification', async () => {
@@ -105,12 +105,12 @@ describe('renderer/utils/links.ts', () => {
       .spyOn(helpers, 'generateGitHubWebUrl')
       .mockResolvedValue(mockNotificationUrl);
     await openNotification(mockSingleNotification);
-    expect(openExternalLinkMock).toHaveBeenCalledWith(mockNotificationUrl);
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(mockNotificationUrl);
   });
 
   it('openParticipatingDocs', () => {
     openGitHubParticipatingDocs();
-    expect(openExternalLinkMock).toHaveBeenCalledWith(
+    expect(mockOpenExternalLink).toHaveBeenCalledWith(
       Constants.GITHUB_DOCS.PARTICIPATING_URL,
     );
   });
diff --git a/src/renderer/utils/notifications/filters/filter.test.ts b/src/renderer/utils/notifications/filters/filter.test.ts
index 11f38902f..95f334869 100644
--- a/src/renderer/utils/notifications/filters/filter.test.ts
+++ b/src/renderer/utils/notifications/filters/filter.test.ts
@@ -1,4 +1,4 @@
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import { createPartialMockNotification } from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
 import { defaultSettings } from '../../../context/defaults';
 import type { Link, SearchToken, SettingsState } from '../../../types';
@@ -16,7 +16,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
 
   describe('filterNotifications', () => {
     const mockNotifications = [
-      partialMockNotification(
+      createPartialMockNotification(
         {
           title: 'User authored notification',
           user: {
@@ -34,7 +34,7 @@ describe('renderer/utils/notifications/filters/filter.ts', () => {
           full_name: 'gitify-app/gitify',
         },
       ),
-      partialMockNotification(
+      createPartialMockNotification(
         {
           title: 'Bot authored notification',
           user: {
diff --git a/src/renderer/utils/notifications/filters/search.test.ts b/src/renderer/utils/notifications/filters/search.test.ts
index 3b590925b..de3d9d830 100644
--- a/src/renderer/utils/notifications/filters/search.test.ts
+++ b/src/renderer/utils/notifications/filters/search.test.ts
@@ -1,4 +1,4 @@
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import { createPartialMockNotification } from '../../../__mocks__/notifications-mocks';
 import type { Link } from '../../../types';
 import type { Owner } from '../../../typesGitHub';
 import {
@@ -36,7 +36,7 @@ describe('renderer/utils/notifications/filters/search.ts', () => {
   });
 
   describe('filterNotificationBySearchTerm', () => {
-    const mockNotification = partialMockNotification(
+    const mockNotification = createPartialMockNotification(
       {
         title: 'User authored notification',
         user: {
diff --git a/src/renderer/utils/notifications/handlers/checkSuite.test.ts b/src/renderer/utils/notifications/handlers/checkSuite.test.ts
index 8f50f8af1..8f8da018b 100644
--- a/src/renderer/utils/notifications/handlers/checkSuite.test.ts
+++ b/src/renderer/utils/notifications/handlers/checkSuite.test.ts
@@ -1,12 +1,14 @@
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import {
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
 import { checkSuiteHandler, getCheckSuiteAttributes } from './checkSuite';
 
 describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
   describe('enrich', () => {
     it('cancelled check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run cancelled for main branch',
         type: 'CheckSuite',
       });
@@ -23,7 +25,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('failed check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run failed for main branch',
         type: 'CheckSuite',
       });
@@ -40,7 +42,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('failed at startup check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run failed at startup for main branch',
         type: 'CheckSuite',
       });
@@ -57,7 +59,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('multiple attempts failed check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run, Attempt #3 failed for main branch',
         type: 'CheckSuite',
       });
@@ -74,7 +76,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('skipped check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run skipped for main branch',
         type: 'CheckSuite',
       });
@@ -91,7 +93,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('successful check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run succeeded for main branch',
         type: 'CheckSuite',
       });
@@ -108,7 +110,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('unknown check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run unknown-status for main branch',
         type: 'CheckSuite',
       });
@@ -122,7 +124,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('unhandled check suite title', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'A title that is not in the structure we expect',
         type: 'CheckSuite',
       });
@@ -139,13 +141,13 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
   it('iconType', () => {
     expect(
       checkSuiteHandler.iconType(
-        createSubjectMock({ type: 'CheckSuite', state: null }),
+        createMockSubject({ type: 'CheckSuite', state: null }),
       ).displayName,
     ).toBe('RocketIcon');
 
     expect(
       checkSuiteHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'CheckSuite',
           state: 'cancelled',
         }),
@@ -154,7 +156,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
 
     expect(
       checkSuiteHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'CheckSuite',
           state: 'failure',
         }),
@@ -163,7 +165,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
 
     expect(
       checkSuiteHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'CheckSuite',
           state: 'skipped',
         }),
@@ -172,7 +174,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
 
     expect(
       checkSuiteHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'CheckSuite',
           state: 'success',
         }),
@@ -182,7 +184,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
 
   describe('getCheckSuiteState', () => {
     it('cancelled check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run cancelled for feature/foo branch',
         type: 'CheckSuite',
       });
@@ -199,7 +201,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('failed check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run failed for main branch',
         type: 'CheckSuite',
       });
@@ -216,7 +218,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('multiple attempts failed check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run, Attempt #3 failed for main branch',
         type: 'CheckSuite',
       });
@@ -233,7 +235,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('skipped check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run skipped for main branch',
         type: 'CheckSuite',
       });
@@ -250,7 +252,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('successful check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run succeeded for main branch',
         type: 'CheckSuite',
       });
@@ -267,7 +269,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('unknown check suite state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'Demo workflow run unknown-status for main branch',
         type: 'CheckSuite',
       });
@@ -284,7 +286,7 @@ describe('renderer/utils/notifications/handlers/checkSuite.ts', () => {
     });
 
     it('unhandled check suite title', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'A title that is not in the structure we expect',
         type: 'CheckSuite',
       });
diff --git a/src/renderer/utils/notifications/handlers/commit.test.ts b/src/renderer/utils/notifications/handlers/commit.test.ts
index bf9d26ba9..d1a54542e 100644
--- a/src/renderer/utils/notifications/handlers/commit.test.ts
+++ b/src/renderer/utils/notifications/handlers/commit.test.ts
@@ -1,19 +1,19 @@
 import axios from 'axios';
 import nock from 'nock';
 
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
 import {
-  partialMockNotification,
-  partialMockUser,
-} from '../../../__mocks__/partial-mocks';
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
+import { createPartialMockUser } from '../../../__mocks__/user-mocks';
 import type { Link } from '../../../types';
 import { commitHandler } from './commit';
 
 describe('renderer/utils/notifications/handlers/commit.ts', () => {
   describe('enrich', () => {
-    const mockAuthor = partialMockUser('some-author');
-    const mockCommenter = partialMockUser('some-commenter');
+    const mockAuthor = createPartialMockUser('some-author');
+    const mockCommenter = createPartialMockUser('some-commenter');
 
     beforeEach(() => {
       // axios will default to using the XHR adapter which can't be intercepted
@@ -22,7 +22,7 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
     });
 
     it('get commit commenter', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'This is a commit with comments',
         type: 'Commit',
         url: 'https://api.github.com/repos/gitify-app/notifications-test/commits/d2a86d80e3d24ea9510d5de6c147e53c30f313a8' as Link,
@@ -54,7 +54,7 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
     });
 
     it('get commit without commenter', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'This is a commit with comments',
         type: 'Commit',
         url: 'https://api.github.com/repos/gitify-app/notifications-test/commits/d2a86d80e3d24ea9510d5de6c147e53c30f313a8' as Link,
@@ -81,7 +81,7 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
     });
 
     it('return early if commit state filtered', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'This is a commit with comments',
         type: 'Commit',
         url: 'https://api.github.com/repos/gitify-app/notifications-test/commits/d2a86d80e3d24ea9510d5de6c147e53c30f313a8' as Link,
@@ -99,7 +99,7 @@ describe('renderer/utils/notifications/handlers/commit.ts', () => {
 
   it('iconType', () => {
     expect(
-      commitHandler.iconType(createSubjectMock({ type: 'Commit' })).displayName,
+      commitHandler.iconType(createMockSubject({ type: 'Commit' })).displayName,
     ).toBe('GitCommitIcon');
   });
 });
diff --git a/src/renderer/utils/notifications/handlers/default.test.ts b/src/renderer/utils/notifications/handlers/default.test.ts
index d1abc5f7c..caebed99b 100644
--- a/src/renderer/utils/notifications/handlers/default.test.ts
+++ b/src/renderer/utils/notifications/handlers/default.test.ts
@@ -1,5 +1,7 @@
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import {
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
 import { IconColor } from '../../../types';
 import type { StateType } from '../../../typesGitHub';
@@ -8,7 +10,7 @@ import { defaultHandler } from './default';
 describe('renderer/utils/notifications/handlers/default.ts', () => {
   describe('enrich', () => {
     it('unhandled subject details', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title:
           'There is no special subject handling for this notification type',
         type: 'RepositoryInvitation',
@@ -24,7 +26,7 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
   });
 
   it('iconType', () => {
-    expect(defaultHandler.iconType(createSubjectMock({})).displayName).toBe(
+    expect(defaultHandler.iconType(createMockSubject({})).displayName).toBe(
       'QuestionIcon',
     );
   });
@@ -50,14 +52,14 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
     ];
 
     it.each(cases)('returns correct color for state %s', (state, expected) => {
-      const subject = createSubjectMock({ state });
+      const subject = createMockSubject({ state });
       expect(defaultHandler.iconColor(subject)).toBe(expected);
     });
   });
 
   describe('formattedNotificationType', () => {
     it('formats state and type with proper casing and spacing', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         title: 'Sample',
         type: 'PullRequest',
         state: 'open',
@@ -69,7 +71,7 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
     });
 
     it('handles missing state (null) gracefully', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         title: 'Sample',
         type: 'Issue',
         state: null,
@@ -83,7 +85,7 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
 
   describe('formattedNotificationNumber', () => {
     it('returns formatted number when present', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         title: 'Sample',
         type: 'Issue',
         state: 'open',
@@ -95,7 +97,7 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
     });
 
     it('returns empty string when number absent', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         title: 'Sample',
         type: 'Issue',
         state: 'open',
@@ -106,7 +108,7 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
 
   describe('formattedNotificationTitle', () => {
     it('appends number in brackets when present', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         title: 'Fix bug',
         type: 'Issue',
         state: 'open',
@@ -118,7 +120,7 @@ describe('renderer/utils/notifications/handlers/default.ts', () => {
     });
 
     it('returns title unchanged when number missing', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         title: 'Improve docs',
         type: 'Issue',
         state: 'open',
diff --git a/src/renderer/utils/notifications/handlers/discussion.test.ts b/src/renderer/utils/notifications/handlers/discussion.test.ts
index e81878886..fe8738329 100644
--- a/src/renderer/utils/notifications/handlers/discussion.test.ts
+++ b/src/renderer/utils/notifications/handlers/discussion.test.ts
@@ -1,8 +1,10 @@
 import axios from 'axios';
 import nock from 'nock';
 
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import {
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
 import type { Link } from '../../../types';
 import type {
@@ -26,7 +28,7 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
       full_name: 'gitify-app/notifications-test',
     };
 
-    const mockNotification = partialMockNotification({
+    const mockNotification = createPartialMockNotification({
       title: 'This is a mock discussion',
       type: 'Discussion',
     });
@@ -281,25 +283,25 @@ describe('renderer/utils/notifications/handlers/discussion.ts', () => {
 
   it('iconType', () => {
     expect(
-      discussionHandler.iconType(createSubjectMock({ type: 'Discussion' }))
+      discussionHandler.iconType(createMockSubject({ type: 'Discussion' }))
         .displayName,
     ).toBe('CommentDiscussionIcon');
 
     expect(
       discussionHandler.iconType(
-        createSubjectMock({ type: 'Discussion', state: 'DUPLICATE' }),
+        createMockSubject({ type: 'Discussion', state: 'DUPLICATE' }),
       ).displayName,
     ).toBe('DiscussionDuplicateIcon');
 
     expect(
       discussionHandler.iconType(
-        createSubjectMock({ type: 'Discussion', state: 'OUTDATED' }),
+        createMockSubject({ type: 'Discussion', state: 'OUTDATED' }),
       ).displayName,
     ).toBe('DiscussionOutdatedIcon');
 
     expect(
       discussionHandler.iconType(
-        createSubjectMock({ type: 'Discussion', state: 'RESOLVED' }),
+        createMockSubject({ type: 'Discussion', state: 'RESOLVED' }),
       ).displayName,
     ).toBe('DiscussionClosedIcon');
   });
diff --git a/src/renderer/utils/notifications/handlers/index.test.ts b/src/renderer/utils/notifications/handlers/index.test.ts
index 7964c41fd..68568b309 100644
--- a/src/renderer/utils/notifications/handlers/index.test.ts
+++ b/src/renderer/utils/notifications/handlers/index.test.ts
@@ -1,4 +1,4 @@
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import { createPartialMockNotification } from '../../../__mocks__/notifications-mocks';
 import type { SubjectType } from '../../../typesGitHub';
 import { checkSuiteHandler } from './checkSuite';
 import { commitHandler } from './commit';
@@ -34,14 +34,14 @@ describe('renderer/utils/notifications/handlers/index.ts', () => {
     it.each(cases)(
       'returns expected handler instance for %s',
       (type, expected) => {
-        const notification = partialMockNotification({ type });
+        const notification = createPartialMockNotification({ type });
         const handler = createNotificationHandler(notification);
         expect(handler).toBe(expected);
       },
     );
 
     it('falls back to default handler for unknown type', () => {
-      const notification = partialMockNotification({
+      const notification = createPartialMockNotification({
         type: 'SomeFutureType' as SubjectType,
       });
       const handler = createNotificationHandler(notification);
diff --git a/src/renderer/utils/notifications/handlers/issue.test.ts b/src/renderer/utils/notifications/handlers/issue.test.ts
index 511aaeee6..0a5bde114 100644
--- a/src/renderer/utils/notifications/handlers/issue.test.ts
+++ b/src/renderer/utils/notifications/handlers/issue.test.ts
@@ -1,25 +1,25 @@
 import axios from 'axios';
 import nock from 'nock';
 
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
 import {
-  partialMockNotification,
-  partialMockUser,
-} from '../../../__mocks__/partial-mocks';
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
+import { createPartialMockUser } from '../../../__mocks__/user-mocks';
 import type { Link } from '../../../types';
 import type { Notification } from '../../../typesGitHub';
 import { issueHandler } from './issue';
 
 describe('renderer/utils/notifications/handlers/issue.ts', () => {
   describe('enrich', () => {
-    const mockAuthor = partialMockUser('some-author');
-    const mockCommenter = partialMockUser('some-commenter');
+    const mockAuthor = createPartialMockUser('some-author');
+    const mockCommenter = createPartialMockUser('some-commenter');
 
     let mockNotification: Notification;
 
     beforeEach(() => {
-      mockNotification = partialMockNotification({
+      mockNotification = createPartialMockNotification({
         title: 'This is a mock issue',
         type: 'Issue',
         url: 'https://api.github.com/repos/gitify-app/notifications-test/issues/1' as Link,
@@ -296,18 +296,18 @@ describe('renderer/utils/notifications/handlers/issue.ts', () => {
 
   it('iconType', () => {
     expect(
-      issueHandler.iconType(createSubjectMock({ type: 'Issue' })).displayName,
+      issueHandler.iconType(createMockSubject({ type: 'Issue' })).displayName,
     ).toBe('IssueOpenedIcon');
 
     expect(
       issueHandler.iconType(
-        createSubjectMock({ type: 'Issue', state: 'draft' }),
+        createMockSubject({ type: 'Issue', state: 'draft' }),
       ).displayName,
     ).toBe('IssueDraftIcon');
 
     expect(
       issueHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'Issue',
           state: 'closed',
         }),
@@ -316,7 +316,7 @@ describe('renderer/utils/notifications/handlers/issue.ts', () => {
 
     expect(
       issueHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'Issue',
           state: 'completed',
         }),
@@ -325,7 +325,7 @@ describe('renderer/utils/notifications/handlers/issue.ts', () => {
 
     expect(
       issueHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'Issue',
           state: 'not_planned',
         }),
@@ -334,7 +334,7 @@ describe('renderer/utils/notifications/handlers/issue.ts', () => {
 
     expect(
       issueHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'Issue',
           state: 'reopened',
         }),
diff --git a/src/renderer/utils/notifications/handlers/pullRequest.test.ts b/src/renderer/utils/notifications/handlers/pullRequest.test.ts
index c70f264bd..c251d6fe2 100644
--- a/src/renderer/utils/notifications/handlers/pullRequest.test.ts
+++ b/src/renderer/utils/notifications/handlers/pullRequest.test.ts
@@ -1,12 +1,12 @@
 import axios from 'axios';
 import nock from 'nock';
 
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
 import {
-  partialMockNotification,
-  partialMockUser,
-} from '../../../__mocks__/partial-mocks';
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
+import { createPartialMockUser } from '../../../__mocks__/user-mocks';
 import type { Link } from '../../../types';
 import type { Notification, PullRequest } from '../../../typesGitHub';
 import {
@@ -19,7 +19,7 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
   let mockNotification: Notification;
 
   beforeEach(() => {
-    mockNotification = partialMockNotification({
+    mockNotification = createPartialMockNotification({
       title: 'This is a mock pull request',
       type: 'PullRequest',
       url: 'https://api.github.com/repos/gitify-app/notifications-test/pulls/1' as Link,
@@ -29,8 +29,8 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
   });
 
   describe('enrich', () => {
-    const mockAuthor = partialMockUser('some-author');
-    const mockCommenter = partialMockUser('some-commenter');
+    const mockAuthor = createPartialMockUser('some-author');
+    const mockCommenter = createPartialMockUser('some-commenter');
 
     beforeEach(() => {
       // axios will default to using the XHR adapter which can't be intercepted
@@ -440,13 +440,13 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
 
   it('iconType', () => {
     expect(
-      pullRequestHandler.iconType(createSubjectMock({ type: 'PullRequest' }))
+      pullRequestHandler.iconType(createMockSubject({ type: 'PullRequest' }))
         .displayName,
     ).toBe('GitPullRequestIcon');
 
     expect(
       pullRequestHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'PullRequest',
           state: 'draft',
         }),
@@ -455,7 +455,7 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
 
     expect(
       pullRequestHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'PullRequest',
           state: 'closed',
         }),
@@ -464,7 +464,7 @@ describe('renderer/utils/notifications/handlers/pullRequest.ts', () => {
 
     expect(
       pullRequestHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'PullRequest',
           state: 'merged',
         }),
diff --git a/src/renderer/utils/notifications/handlers/release.test.ts b/src/renderer/utils/notifications/handlers/release.test.ts
index 49e6f87a4..530c8d0f9 100644
--- a/src/renderer/utils/notifications/handlers/release.test.ts
+++ b/src/renderer/utils/notifications/handlers/release.test.ts
@@ -1,18 +1,18 @@
 import axios from 'axios';
 import nock from 'nock';
 
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
 import {
-  partialMockNotification,
-  partialMockUser,
-} from '../../../__mocks__/partial-mocks';
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
+import { createPartialMockUser } from '../../../__mocks__/user-mocks';
 import type { Link } from '../../../types';
 import { releaseHandler } from './release';
 
 describe('renderer/utils/notifications/handlers/release.ts', () => {
   describe('enrich', () => {
-    const mockAuthor = partialMockUser('some-author');
+    const mockAuthor = createPartialMockUser('some-author');
 
     beforeEach(() => {
       // axios will default to using the XHR adapter which can't be intercepted
@@ -21,7 +21,7 @@ describe('renderer/utils/notifications/handlers/release.ts', () => {
     });
 
     it('release notification', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'This is a mock release',
         type: 'Release',
         url: 'https://api.github.com/repos/gitify-app/notifications-test/releases/1' as Link,
@@ -50,7 +50,7 @@ describe('renderer/utils/notifications/handlers/release.ts', () => {
     });
 
     it('return early if release state filtered', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'This is a mock release',
         type: 'Release',
         url: 'https://api.github.com/repos/gitify-app/notifications-test/releases/1' as Link,
@@ -70,7 +70,7 @@ describe('renderer/utils/notifications/handlers/release.ts', () => {
   it('iconType', () => {
     expect(
       releaseHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'Release',
         }),
       ).displayName,
diff --git a/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.test.ts b/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.test.ts
index b6fd92706..bd99284ab 100644
--- a/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.test.ts
+++ b/src/renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.test.ts
@@ -1,11 +1,11 @@
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
+import { createMockSubject } from '../../../__mocks__/notifications-mocks';
 import { repositoryDependabotAlertsThreadHandler } from './repositoryDependabotAlertsThread';
 
 describe('renderer/utils/notifications/handlers/repositoryDependabotAlertsThread.ts', () => {
   it('iconType', () => {
     expect(
       repositoryDependabotAlertsThreadHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'RepositoryDependabotAlertsThread',
         }),
       ).displayName,
diff --git a/src/renderer/utils/notifications/handlers/repositoryInvitation.test.ts b/src/renderer/utils/notifications/handlers/repositoryInvitation.test.ts
index 69062a277..1ccefa670 100644
--- a/src/renderer/utils/notifications/handlers/repositoryInvitation.test.ts
+++ b/src/renderer/utils/notifications/handlers/repositoryInvitation.test.ts
@@ -1,11 +1,11 @@
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
+import { createMockSubject } from '../../../__mocks__/notifications-mocks';
 import { repositoryInvitationHandler } from './repositoryInvitation';
 
 describe('renderer/utils/notifications/handlers/repositoryInvitation.ts', () => {
   it('iconType', () => {
     expect(
       repositoryInvitationHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'RepositoryInvitation',
         }),
       ).displayName,
diff --git a/src/renderer/utils/notifications/handlers/repositoryVulnerabilityAlert.test.ts b/src/renderer/utils/notifications/handlers/repositoryVulnerabilityAlert.test.ts
index f6055ed3d..eea848173 100644
--- a/src/renderer/utils/notifications/handlers/repositoryVulnerabilityAlert.test.ts
+++ b/src/renderer/utils/notifications/handlers/repositoryVulnerabilityAlert.test.ts
@@ -1,11 +1,11 @@
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
+import { createMockSubject } from '../../../__mocks__/notifications-mocks';
 import { repositoryVulnerabilityAlertHandler } from './repositoryVulnerabilityAlert';
 
 describe('renderer/utils/notifications/handlers/repositoryVulnerabilityAlert.ts', () => {
   it('iconType', () => {
     expect(
       repositoryVulnerabilityAlertHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'RepositoryVulnerabilityAlert',
         }),
       ).displayName,
diff --git a/src/renderer/utils/notifications/handlers/utils.test.ts b/src/renderer/utils/notifications/handlers/utils.test.ts
index 9437f40fa..b16f1d812 100644
--- a/src/renderer/utils/notifications/handlers/utils.test.ts
+++ b/src/renderer/utils/notifications/handlers/utils.test.ts
@@ -1,9 +1,9 @@
-import { partialMockUser } from '../../../__mocks__/partial-mocks';
+import { createPartialMockUser } from '../../../__mocks__/user-mocks';
 import { formatForDisplay, getSubjectUser } from './utils';
 
 describe('renderer/utils/notifications/handlers/utils.ts', () => {
   describe('getSubjectUser', () => {
-    const mockAuthor = partialMockUser('some-author');
+    const mockAuthor = createPartialMockUser('some-author');
 
     it('returns null when all users are null', () => {
       const result = getSubjectUser([null, null]);
diff --git a/src/renderer/utils/notifications/handlers/workflowRun.test.ts b/src/renderer/utils/notifications/handlers/workflowRun.test.ts
index 5d843cf1d..7d95c4b41 100644
--- a/src/renderer/utils/notifications/handlers/workflowRun.test.ts
+++ b/src/renderer/utils/notifications/handlers/workflowRun.test.ts
@@ -1,12 +1,14 @@
-import { createSubjectMock } from '../../../__mocks__/notifications-mocks';
-import { partialMockNotification } from '../../../__mocks__/partial-mocks';
+import {
+  createMockSubject,
+  createPartialMockNotification,
+} from '../../../__mocks__/notifications-mocks';
 import { mockSettings } from '../../../__mocks__/state-mocks';
 import { getWorkflowRunAttributes, workflowRunHandler } from './workflowRun';
 
 describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
   describe('enrich', () => {
     it('deploy review workflow run state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'some-user requested your review to deploy to an environment',
         type: 'WorkflowRun',
       });
@@ -23,7 +25,7 @@ describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
     });
 
     it('unknown workflow run state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title:
           'some-user requested your unknown-state to deploy to an environment',
         type: 'WorkflowRun',
@@ -38,7 +40,7 @@ describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
     });
 
     it('unhandled workflow run title', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'unhandled workflow run structure',
         type: 'WorkflowRun',
       });
@@ -55,7 +57,7 @@ describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
   it('iconType', () => {
     expect(
       workflowRunHandler.iconType(
-        createSubjectMock({
+        createMockSubject({
           type: 'WorkflowRun',
         }),
       ).displayName,
@@ -64,7 +66,7 @@ describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
 
   describe('getWorkflowRunAttributes', () => {
     it('deploy review workflow run state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'some-user requested your review to deploy to an environment',
         type: 'WorkflowRun',
       });
@@ -79,7 +81,7 @@ describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
     });
 
     it('unknown workflow run state', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title:
           'some-user requested your unknown-state to deploy to an environment',
         type: 'WorkflowRun',
@@ -95,7 +97,7 @@ describe('renderer/utils/notifications/handlers/workflowRun.ts', () => {
     });
 
     it('unhandled workflow run title', async () => {
-      const mockNotification = partialMockNotification({
+      const mockNotification = createPartialMockNotification({
         title: 'unhandled workflow run structure',
         type: 'WorkflowRun',
       });
diff --git a/src/renderer/utils/notifications/notifications.test.ts b/src/renderer/utils/notifications/notifications.test.ts
index 8bed45437..e39605513 100644
--- a/src/renderer/utils/notifications/notifications.test.ts
+++ b/src/renderer/utils/notifications/notifications.test.ts
@@ -1,16 +1,16 @@
 import axios from 'axios';
 import nock from 'nock';
 
+import {
+  mockGitHubCloudAccount,
+  mockGitHubEnterpriseServerAccount,
+} from '../../__mocks__/account-mocks';
 import {
   createMockNotificationForRepoName,
+  createPartialMockNotification,
   mockSingleAccountNotifications,
 } from '../../__mocks__/notifications-mocks';
-import { partialMockNotification } from '../../__mocks__/partial-mocks';
-import {
-  mockGitHubCloudAccount,
-  mockGitHubEnterpriseServerAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import {
   type AccountNotifications,
   GroupBy,
@@ -55,7 +55,7 @@ describe('renderer/utils/notifications/notifications.ts', () => {
       .mockImplementation();
 
     const mockError = new Error('Test error');
-    const mockNotification = partialMockNotification({
+    const mockNotification = createPartialMockNotification({
       title: 'This issue will throw an error',
       type: 'Issue',
       url: 'https://api.github.com/repos/gitify-app/notifications-test/issues/1' as Link,
diff --git a/src/renderer/utils/notifications/remove.test.ts b/src/renderer/utils/notifications/remove.test.ts
index eb2c1d379..a699d1948 100644
--- a/src/renderer/utils/notifications/remove.test.ts
+++ b/src/renderer/utils/notifications/remove.test.ts
@@ -1,8 +1,6 @@
+import { mockGitHubEnterpriseServerAccount } from '../../__mocks__/account-mocks';
 import { mockSingleAccountNotifications } from '../../__mocks__/notifications-mocks';
-import {
-  mockGitHubEnterpriseServerAccount,
-  mockSettings,
-} from '../../__mocks__/state-mocks';
+import { mockSettings } from '../../__mocks__/state-mocks';
 import { mockSingleNotification } from '../api/__mocks__/response-mocks';
 import { removeNotificationsForAccount } from './remove';
 
diff --git a/src/renderer/utils/notifications/utils.test.ts b/src/renderer/utils/notifications/utils.test.ts
index c16b6c3e8..647f0187b 100644
--- a/src/renderer/utils/notifications/utils.test.ts
+++ b/src/renderer/utils/notifications/utils.test.ts
@@ -1,8 +1,8 @@
-import { createMockNotificationForRepoName } from '../../__mocks__/notifications-mocks';
 import {
   mockGitHubCloudAccount,
   mockGitHubEnterpriseServerAccount,
-} from '../../__mocks__/state-mocks';
+} from '../../__mocks__/account-mocks';
+import { createMockNotificationForRepoName } from '../../__mocks__/notifications-mocks';
 import type { AccountNotifications } from '../../types';
 import { getNewNotifications } from './utils';