diff --git a/src/renderer/utils/forges/github/handlers/checkSuite.test.ts b/src/renderer/utils/forges/github/handlers/checkSuite.test.ts
index 93a1e3d9d..8b4a259eb 100644
--- a/src/renderer/utils/forges/github/handlers/checkSuite.test.ts
+++ b/src/renderer/utils/forges/github/handlers/checkSuite.test.ts
@@ -1,7 +1,11 @@
 import { mockPartialGitifyNotification } from '../../../../__mocks__/notifications-mocks';
 
-import type { GitifyNotification } from '../../../../types';
-import { type GitifyCheckSuiteStatus, IconColor, type Link } from '../../../../types';
+import {
+  type GitifyCheckSuiteStatus,
+  type GitifyNotification,
+  IconColor,
+  type Link,
+} from '../../../../types';
 
 import { checkSuiteHandler, getCheckSuiteAttributes } from './checkSuite';
 
diff --git a/src/renderer/utils/forges/github/handlers/default.test.ts b/src/renderer/utils/forges/github/handlers/default.test.ts
index 1133dc407..c788738b9 100644
--- a/src/renderer/utils/forges/github/handlers/default.test.ts
+++ b/src/renderer/utils/forges/github/handlers/default.test.ts
@@ -1,7 +1,11 @@
 import { mockPartialGitifyNotification } from '../../../../__mocks__/notifications-mocks';
 
-import type { GitifyNotification } from '../../../../types';
-import { type GitifyNotificationState, IconColor, type Link } from '../../../../types';
+import {
+  type GitifyNotification,
+  type GitifyNotificationState,
+  IconColor,
+  type Link,
+} from '../../../../types';
 
 import { defaultHandler } from './default';
 
diff --git a/src/renderer/utils/forges/github/handlers/discussion.test.ts b/src/renderer/utils/forges/github/handlers/discussion.test.ts
index ba98e1024..6c5ca46a5 100644
--- a/src/renderer/utils/forges/github/handlers/discussion.test.ts
+++ b/src/renderer/utils/forges/github/handlers/discussion.test.ts
@@ -7,9 +7,9 @@ import {
   noReactionGroups,
 } from '../__mocks__/response-mocks';
 
-import type { GitifyNotification } from '../../../../types';
 import {
   type GitifyDiscussionState,
+  type GitifyNotification,
   type GitifySubject,
   IconColor,
   type Link,
diff --git a/src/renderer/utils/forges/github/handlers/issue.test.ts b/src/renderer/utils/forges/github/handlers/issue.test.ts
index 828edc887..a4b12507e 100644
--- a/src/renderer/utils/forges/github/handlers/issue.test.ts
+++ b/src/renderer/utils/forges/github/handlers/issue.test.ts
@@ -6,8 +6,13 @@ import {
   noReactionGroups,
 } from '../__mocks__/response-mocks';
 
-import type { GitifyNotification } from '../../../../types';
-import { type GitifyIssueState, type GitifySubject, IconColor, type Link } from '../../../../types';
+import {
+  type GitifyIssueState,
+  type GitifyNotification,
+  type GitifySubject,
+  IconColor,
+  type Link,
+} from '../../../../types';
 
 import * as apiClient from '../client';
 import type { FetchIssueByNumberQuery } from '../graphql/generated/graphql';
diff --git a/src/renderer/utils/forges/github/handlers/pullRequest.test.ts b/src/renderer/utils/forges/github/handlers/pullRequest.test.ts
index 5d708180d..0e9ee877c 100644
--- a/src/renderer/utils/forges/github/handlers/pullRequest.test.ts
+++ b/src/renderer/utils/forges/github/handlers/pullRequest.test.ts
@@ -8,8 +8,8 @@ import {
   noReactionGroups,
 } from '../__mocks__/response-mocks';
 
-import type { GitifyNotification } from '../../../../types';
 import {
+  type GitifyNotification,
   type GitifyPullRequestState,
   type GitifySubject,
   IconColor,
diff --git a/src/renderer/utils/system/links.test.ts b/src/renderer/utils/system/links.test.ts
index 4d2f92edc..360381ee1 100644
--- a/src/renderer/utils/system/links.test.ts
+++ b/src/renderer/utils/system/links.test.ts
@@ -1,7 +1,7 @@
-import { mockGitHubCloudAccount } from '../../__mocks__/account-mocks';
 import {
   mockBitbucketAccount,
   mockGiteaAccount,
+  mockGitHubCloudAccount,
   mockGitLabAccount,
 } from '../../__mocks__/account-mocks';
 import { mockGitifyNotification } from '../../__mocks__/notifications-mocks';
diff --git a/vite.config.mts b/vite.config.mts
index 9386012c2..fde781b4b 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -212,6 +212,9 @@ export default defineConfig({
     },
     ignorePatterns: ['**/generated/**', 'build/**', 'dist/**', 'coverage/**', 'node_modules/**'],
     rules: {
+      'import/no-self-import': 'error',
+      'import/no-duplicates': 'error',
+      'import/no-empty-named-blocks': 'error',
       'no-console': 'error',
       'no-unused-vars': [
         'error',