diff --git a/app/main/autoupdater.ts b/app/main/autoupdater.ts
index a0d73d89..5e36f37f 100644
--- a/app/main/autoupdater.ts
+++ b/app/main/autoupdater.ts
@@ -1,13 +1,15 @@
 import {app, dialog, session} from 'electron';
-import {UpdateDownloadedEvent, UpdateInfo, autoUpdater} from 'electron-updater';
 import util from 'util';
-import {linuxUpdateNotification} from './linuxupdater';	// Required only in case of linux
 
-import log from 'electron-log';
 import isDev from 'electron-is-dev';
+import log from 'electron-log';
+import {UpdateDownloadedEvent, UpdateInfo, autoUpdater} from 'electron-updater';
+
 import * as ConfigUtil from '../renderer/js/utils/config-util';
 import * as LinkUtil from '../renderer/js/utils/link-util';
 
+import {linuxUpdateNotification} from './linuxupdater';	// Required only in case of linux
+
 const sleep = util.promisify(setTimeout);
 
 export async function appUpdater(updateFromMenu = false): Promise<void> {
diff --git a/app/main/index.ts b/app/main/index.ts
index 605d6fa0..784c8600 100644
--- a/app/main/index.ts
+++ b/app/main/index.ts
@@ -1,18 +1,20 @@
-import {sentryInit} from '../renderer/js/utils/sentry-util';
-import {appUpdater} from './autoupdater';
-import {setAutoLaunch} from './startup';
+
+import electron, {app, dialog, ipcMain, session} from 'electron';
+import fs from 'fs';
+import path from 'path';
 
 import windowStateKeeper from 'electron-window-state';
-import path from 'path';
-import fs from 'fs';
-import electron, {app, dialog, ipcMain, session} from 'electron';
 
-import * as AppMenu from './menu';
 import * as BadgeSettings from '../renderer/js/pages/preference/badge-settings';
 import * as CertificateUtil from '../renderer/js/utils/certificate-util';
 import * as ConfigUtil from '../renderer/js/utils/config-util';
 import * as ProxyUtil from '../renderer/js/utils/proxy-util';
+import {sentryInit} from '../renderer/js/utils/sentry-util';
+
+import {appUpdater} from './autoupdater';
+import * as AppMenu from './menu';
 import {_getServerSettings, _saveServerIcon, _isOnline} from './request';
+import {setAutoLaunch} from './startup';
 
 let mainWindowState: windowStateKeeper.State;
 
diff --git a/app/main/linuxupdater.ts b/app/main/linuxupdater.ts
index 55e0850f..973bc3f7 100644
--- a/app/main/linuxupdater.ts
+++ b/app/main/linuxupdater.ts
@@ -2,9 +2,11 @@ import {app, Notification, net} from 'electron';
 
 import getStream from 'get-stream';
 import semver from 'semver';
+
 import * as ConfigUtil from '../renderer/js/utils/config-util';
 import * as LinuxUpdateUtil from '../renderer/js/utils/linux-update-util';
 import Logger from '../renderer/js/utils/logger-util';
+
 import {fetchResponse} from './request';
 
 const logger = new Logger({
diff --git a/app/main/menu.ts b/app/main/menu.ts
index 2e003e1c..9129f4a8 100644
--- a/app/main/menu.ts
+++ b/app/main/menu.ts
@@ -1,12 +1,14 @@
 import {app, shell, BrowserWindow, Menu} from 'electron';
-import {appUpdater} from './autoupdater';
 
 import AdmZip from 'adm-zip';
-import * as DNDUtil from '../renderer/js/utils/dnd-util';
+
+import type {ServerOrFunctionalTab} from '../renderer/js/main';
 import * as ConfigUtil from '../renderer/js/utils/config-util';
+import * as DNDUtil from '../renderer/js/utils/dnd-util';
 import * as LinkUtil from '../renderer/js/utils/link-util';
 import * as t from '../renderer/js/utils/translation-util';
-import type {ServerOrFunctionalTab} from '../renderer/js/main';
+
+import {appUpdater} from './autoupdater';
 
 export interface MenuProps {
 	tabs: ServerOrFunctionalTab[];
diff --git a/app/main/request.ts b/app/main/request.ts
index 7ca0ab0e..7931d715 100644
--- a/app/main/request.ts
+++ b/app/main/request.ts
@@ -3,12 +3,14 @@ import fs from 'fs';
 import path from 'path';
 import stream from 'stream';
 import util from 'util';
-import * as Messages from '../resources/messages';
-import Logger from '../renderer/js/utils/logger-util';
-import {ServerConf} from '../renderer/js/utils/domain-util';
+
 import escape from 'escape-html';
 import getStream from 'get-stream';
 
+import {ServerConf} from '../renderer/js/utils/domain-util';
+import Logger from '../renderer/js/utils/logger-util';
+import * as Messages from '../resources/messages';
+
 export async function fetchResponse(request: ClientRequest): Promise<IncomingMessage> {
 	return new Promise((resolve, reject) => {
 		request.on('response', resolve);
diff --git a/app/main/startup.ts b/app/main/startup.ts
index 5d81e628..224774cf 100644
--- a/app/main/startup.ts
+++ b/app/main/startup.ts
@@ -2,6 +2,7 @@ import {app} from 'electron';
 
 import AutoLaunch from 'auto-launch';
 import isDev from 'electron-is-dev';
+
 import * as ConfigUtil from '../renderer/js/utils/config-util';
 
 export const setAutoLaunch = async (AutoLaunchValue: boolean): Promise<void> => {
diff --git a/app/renderer/js/clipboard-decrypter.ts b/app/renderer/js/clipboard-decrypter.ts
index bce0d1a8..738713b2 100644
--- a/app/renderer/js/clipboard-decrypter.ts
+++ b/app/renderer/js/clipboard-decrypter.ts
@@ -1,5 +1,5 @@
-import {clipboard} from 'electron';
 import crypto from 'crypto';
+import {clipboard} from 'electron';
 
 // This helper is exposed via electron_bridge for use in the social
 // login flow.
diff --git a/app/renderer/js/components/context-menu.ts b/app/renderer/js/components/context-menu.ts
index 86aa805d..cc20121e 100644
--- a/app/renderer/js/components/context-menu.ts
+++ b/app/renderer/js/components/context-menu.ts
@@ -1,4 +1,5 @@
 import {remote, ContextMenuParams} from 'electron';
+
 import * as t from '../utils/translation-util';
 const {clipboard, Menu} = remote;
 
diff --git a/app/renderer/js/components/handle-external-link.ts b/app/renderer/js/components/handle-external-link.ts
index 92eac65d..9691eeb7 100644
--- a/app/renderer/js/components/handle-external-link.ts
+++ b/app/renderer/js/components/handle-external-link.ts
@@ -1,7 +1,8 @@
 import {ipcRenderer, remote} from 'electron';
 
-import * as LinkUtil from '../utils/link-util';
 import * as ConfigUtil from '../utils/config-util';
+import * as LinkUtil from '../utils/link-util';
+
 import type WebView from './webview';
 
 const {shell, app} = remote;
diff --git a/app/renderer/js/components/server-tab.ts b/app/renderer/js/components/server-tab.ts
index ccb2528b..786f5e81 100644
--- a/app/renderer/js/components/server-tab.ts
+++ b/app/renderer/js/components/server-tab.ts
@@ -1,8 +1,9 @@
 import {ipcRenderer} from 'electron';
 
-import Tab, {TabProps} from './tab';
 import * as SystemUtil from '../utils/system-util';
 
+import Tab, {TabProps} from './tab';
+
 export default class ServerTab extends Tab {
 	$badge: Element;
 
diff --git a/app/renderer/js/components/tab.ts b/app/renderer/js/components/tab.ts
index 6feec49d..acc4c68c 100644
--- a/app/renderer/js/components/tab.ts
+++ b/app/renderer/js/components/tab.ts
@@ -1,5 +1,5 @@
-import WebView from './webview';
 import BaseComponent from './base';
+import WebView from './webview';
 
 export interface TabProps {
 	role: string;
diff --git a/app/renderer/js/components/webview.ts b/app/renderer/js/components/webview.ts
index 860996b8..ea0c09cd 100644
--- a/app/renderer/js/components/webview.ts
+++ b/app/renderer/js/components/webview.ts
@@ -1,12 +1,13 @@
 import {ipcRenderer, remote} from 'electron';
-
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
+
 import * as ConfigUtil from '../utils/config-util';
 import * as SystemUtil from '../utils/system-util';
+
 import BaseComponent from './base';
-import handleExternalLink from './handle-external-link';
 import {contextMenu} from './context-menu';
+import handleExternalLink from './handle-external-link';
 
 const {app, dialog} = remote;
 
diff --git a/app/renderer/js/electron-bridge.ts b/app/renderer/js/electron-bridge.ts
index c1239ad9..66ef752f 100644
--- a/app/renderer/js/electron-bridge.ts
+++ b/app/renderer/js/electron-bridge.ts
@@ -1,5 +1,4 @@
 import {ipcRenderer} from 'electron';
-
 import {EventEmitter} from 'events';
 
 import {ClipboardDecrypterImpl} from './clipboard-decrypter';
diff --git a/app/renderer/js/feedback.ts b/app/renderer/js/feedback.ts
index bb6013b0..21dc586d 100644
--- a/app/renderer/js/feedback.ts
+++ b/app/renderer/js/feedback.ts
@@ -1,8 +1,8 @@
 import {remote} from 'electron';
-import SendFeedback from '@electron-elements/send-feedback';
-
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
+
+import SendFeedback from '@electron-elements/send-feedback';
 
 const {app} = remote;
 
diff --git a/app/renderer/js/main.ts b/app/renderer/js/main.ts
index ac019889..ffbccf53 100644
--- a/app/renderer/js/main.ts
+++ b/app/renderer/js/main.ts
@@ -1,27 +1,29 @@
 import {ipcRenderer, remote, clipboard} from 'electron';
-import {feedbackHolder} from './feedback';
-
 import path from 'path';
-import escape from 'escape-html';
+
 import isDev from 'electron-is-dev';
-const {session, app, Menu, dialog} = remote;
+import escape from 'escape-html';
+
+import * as Messages from '../../resources/messages';
+
+import FunctionalTab from './components/functional-tab';
+import ServerTab from './components/server-tab';
+import WebView from './components/webview';
+import {feedbackHolder} from './feedback';
+import * as CommonUtil from './utils/common-util';
+import * as ConfigUtil from './utils/config-util';
+import * as DNDUtil from './utils/dnd-util';
+import type {DNDSettings} from './utils/dnd-util';
+import * as DomainUtil from './utils/domain-util';
+import * as EnterpriseUtil from './utils/enterprise-util';
+import * as LinkUtil from './utils/link-util';
+import Logger from './utils/logger-util';
+import ReconnectUtil from './utils/reconnect-util';
 
 // eslint-disable-next-line import/no-unassigned-import
 import './tray';
 
-import * as DomainUtil from './utils/domain-util';
-import WebView from './components/webview';
-import ServerTab from './components/server-tab';
-import FunctionalTab from './components/functional-tab';
-import * as ConfigUtil from './utils/config-util';
-import * as DNDUtil from './utils/dnd-util';
-import ReconnectUtil from './utils/reconnect-util';
-import Logger from './utils/logger-util';
-import * as CommonUtil from './utils/common-util';
-import * as EnterpriseUtil from './utils/enterprise-util';
-import * as LinkUtil from './utils/link-util';
-import * as Messages from '../../resources/messages';
-import type {DNDSettings} from './utils/dnd-util';
+const {session, app, Menu, dialog} = remote;
 
 interface FunctionalTabProps {
 	name: string;
diff --git a/app/renderer/js/notification/darwin-notifications.ts b/app/renderer/js/notification/darwin-notifications.ts
index 2405344c..a154ede3 100644
--- a/app/renderer/js/notification/darwin-notifications.ts
+++ b/app/renderer/js/notification/darwin-notifications.ts
@@ -1,12 +1,14 @@
 import {ipcRenderer} from 'electron';
+
+import MacNotifier from 'node-mac-notifier';
+
+import electron_bridge from '../electron-bridge';
+import * as ConfigUtil from '../utils/config-util';
+
 import {
 	appId, customReply, focusCurrentServer, parseReply
 } from './helpers';
 
-import MacNotifier from 'node-mac-notifier';
-import * as ConfigUtil from '../utils/config-util';
-import electron_bridge from '../electron-bridge';
-
 type ReplyHandler = (response: string) => void;
 type ClickHandler = () => void;
 let replyHandler: ReplyHandler;
diff --git a/app/renderer/js/notification/default-notification.ts b/app/renderer/js/notification/default-notification.ts
index 7e701d3b..098f3d92 100644
--- a/app/renderer/js/notification/default-notification.ts
+++ b/app/renderer/js/notification/default-notification.ts
@@ -1,8 +1,9 @@
 import {ipcRenderer} from 'electron';
-import {focusCurrentServer} from './helpers';
 
 import * as ConfigUtil from '../utils/config-util';
 
+import {focusCurrentServer} from './helpers';
+
 const NativeNotification = window.Notification;
 export default class BaseNotification extends NativeNotification {
 	constructor(title: string, options: NotificationOptions) {
diff --git a/app/renderer/js/notification/index.ts b/app/renderer/js/notification/index.ts
index 5cb962b7..5edd4337 100644
--- a/app/renderer/js/notification/index.ts
+++ b/app/renderer/js/notification/index.ts
@@ -1,8 +1,10 @@
 import {remote} from 'electron';
+
 import electron_bridge from '../electron-bridge';
-import {appId, loadBots} from './helpers';
 
 import DefaultNotification from './default-notification';
+import {appId, loadBots} from './helpers';
+
 const {app} = remote;
 
 // From https://github.com/felixrieseberg/electron-windows-notifications#appusermodelid
diff --git a/app/renderer/js/pages/preference/add-certificate.ts b/app/renderer/js/pages/preference/add-certificate.ts
index 334b151c..5505d82b 100644
--- a/app/renderer/js/pages/preference/add-certificate.ts
+++ b/app/renderer/js/pages/preference/add-certificate.ts
@@ -1,8 +1,8 @@
 'use-strict';
 
 import {remote, OpenDialogOptions} from 'electron';
-
 import path from 'path';
+
 import BaseComponent from '../../components/base';
 import * as CertificateUtil from '../../utils/certificate-util';
 import * as DomainUtil from '../../utils/domain-util';
diff --git a/app/renderer/js/pages/preference/base-section.ts b/app/renderer/js/pages/preference/base-section.ts
index 5d0be290..8276b82d 100644
--- a/app/renderer/js/pages/preference/base-section.ts
+++ b/app/renderer/js/pages/preference/base-section.ts
@@ -1,4 +1,5 @@
 import {ipcRenderer} from 'electron';
+
 import escape from 'escape-html';
 
 import BaseComponent from '../../components/base';
diff --git a/app/renderer/js/pages/preference/connected-org-section.ts b/app/renderer/js/pages/preference/connected-org-section.ts
index 745cd633..48fe9f69 100644
--- a/app/renderer/js/pages/preference/connected-org-section.ts
+++ b/app/renderer/js/pages/preference/connected-org-section.ts
@@ -1,12 +1,13 @@
 import {ipcRenderer} from 'electron';
 
-import BaseSection from './base-section';
 import * as DomainUtil from '../../utils/domain-util';
-import ServerInfoForm from './server-info-form';
-import AddCertificate from './add-certificate';
-import FindAccounts from './find-accounts';
 import * as t from '../../utils/translation-util';
 
+import AddCertificate from './add-certificate';
+import BaseSection from './base-section';
+import FindAccounts from './find-accounts';
+import ServerInfoForm from './server-info-form';
+
 interface ConnectedOrgSectionProps {
 	$root: Element;
 }
diff --git a/app/renderer/js/pages/preference/general-section.ts b/app/renderer/js/pages/preference/general-section.ts
index b24366c4..894f081a 100644
--- a/app/renderer/js/pages/preference/general-section.ts
+++ b/app/renderer/js/pages/preference/general-section.ts
@@ -1,18 +1,19 @@
 import {ipcRenderer, remote, OpenDialogOptions} from 'electron';
-
 import path from 'path';
+
+import Tagify from '@yaireo/tagify';
 import fs from 'fs-extra';
+import ISO6391 from 'iso-639-1';
 
-const {app, dialog, session} = remote;
-const currentBrowserWindow = remote.getCurrentWindow();
-
-import BaseSection from './base-section';
+import supportedLocales from '../../../../translations/supported-locales.json';
 import * as ConfigUtil from '../../utils/config-util';
 import * as EnterpriseUtil from '../../utils/enterprise-util';
 import * as t from '../../utils/translation-util';
-import supportedLocales from '../../../../translations/supported-locales.json';
-import Tagify from '@yaireo/tagify';
-import ISO6391 from 'iso-639-1';
+
+import BaseSection from './base-section';
+
+const {app, dialog, session} = remote;
+const currentBrowserWindow = remote.getCurrentWindow();
 
 interface GeneralSectionProps {
 	$root: Element;
diff --git a/app/renderer/js/pages/preference/network-section.ts b/app/renderer/js/pages/preference/network-section.ts
index e5534c83..4be05dda 100644
--- a/app/renderer/js/pages/preference/network-section.ts
+++ b/app/renderer/js/pages/preference/network-section.ts
@@ -1,9 +1,10 @@
 import {ipcRenderer} from 'electron';
 
-import BaseSection from './base-section';
 import * as ConfigUtil from '../../utils/config-util';
 import * as t from '../../utils/translation-util';
 
+import BaseSection from './base-section';
+
 interface NetworkSectionProps {
 	$root: Element;
 }
diff --git a/app/renderer/js/pages/preference/preference.ts b/app/renderer/js/pages/preference/preference.ts
index a5f97597..1bbff3dd 100644
--- a/app/renderer/js/pages/preference/preference.ts
+++ b/app/renderer/js/pages/preference/preference.ts
@@ -1,14 +1,15 @@
 import {ipcRenderer} from 'electron';
 
 import BaseComponent from '../../components/base';
-import Nav from './nav';
-import ServersSection from './servers-section';
-import GeneralSection from './general-section';
-import NetworkSection from './network-section';
-import ConnectedOrgSection from './connected-org-section';
-import ShortcutsSection from './shortcuts-section';
 import type {DNDSettings} from '../../utils/dnd-util';
 
+import ConnectedOrgSection from './connected-org-section';
+import GeneralSection from './general-section';
+import Nav from './nav';
+import NetworkSection from './network-section';
+import ServersSection from './servers-section';
+import ShortcutsSection from './shortcuts-section';
+
 type Section = ServersSection | GeneralSection | NetworkSection | ConnectedOrgSection | ShortcutsSection;
 
 export default class PreferenceView extends BaseComponent {
diff --git a/app/renderer/js/pages/preference/server-info-form.ts b/app/renderer/js/pages/preference/server-info-form.ts
index 90b80fd2..bd2b647c 100644
--- a/app/renderer/js/pages/preference/server-info-form.ts
+++ b/app/renderer/js/pages/preference/server-info-form.ts
@@ -1,8 +1,8 @@
 import {remote, ipcRenderer} from 'electron';
 
+import * as Messages from '../../../../resources/messages';
 import BaseComponent from '../../components/base';
 import * as DomainUtil from '../../utils/domain-util';
-import * as Messages from '../../../../resources/messages';
 import * as t from '../../utils/translation-util';
 
 const {dialog} = remote;
diff --git a/app/renderer/js/pages/preference/servers-section.ts b/app/renderer/js/pages/preference/servers-section.ts
index e83e1d2b..72eff2f2 100644
--- a/app/renderer/js/pages/preference/servers-section.ts
+++ b/app/renderer/js/pages/preference/servers-section.ts
@@ -1,6 +1,7 @@
+import * as t from '../../utils/translation-util';
+
 import BaseSection from './base-section';
 import NewServerForm from './new-server-form';
-import * as t from '../../utils/translation-util';
 
 interface ServersSectionProps {
 	$root: Element;
diff --git a/app/renderer/js/pages/preference/shortcuts-section.ts b/app/renderer/js/pages/preference/shortcuts-section.ts
index d88dad74..ace46832 100644
--- a/app/renderer/js/pages/preference/shortcuts-section.ts
+++ b/app/renderer/js/pages/preference/shortcuts-section.ts
@@ -1,7 +1,8 @@
-import BaseSection from './base-section';
 import * as LinkUtil from '../../utils/link-util';
 import * as t from '../../utils/translation-util';
 
+import BaseSection from './base-section';
+
 interface ShortcutsSectionProps {
 	$root: Element;
 }
diff --git a/app/renderer/js/preload.ts b/app/renderer/js/preload.ts
index e71041f8..14d4251c 100644
--- a/app/renderer/js/preload.ts
+++ b/app/renderer/js/preload.ts
@@ -3,6 +3,7 @@ import fs from 'fs';
 
 import isDev from 'electron-is-dev';
 
+import electron_bridge from './electron-bridge';
 import * as NetworkError from './pages/network';
 
 // eslint-disable-next-line import/no-unassigned-import
@@ -12,7 +13,6 @@ import './notification';
 // eslint-disable-next-line import/no-unassigned-import
 import './shared/preventdrag';
 
-import electron_bridge from './electron-bridge';
 contextBridge.exposeInMainWorld('raw_electron_bridge', electron_bridge);
 
 ipcRenderer.on('logout', () => {
diff --git a/app/renderer/js/tray.ts b/app/renderer/js/tray.ts
index e0345213..b8834d36 100644
--- a/app/renderer/js/tray.ts
+++ b/app/renderer/js/tray.ts
@@ -1,6 +1,6 @@
 import {ipcRenderer, remote, WebviewTag, NativeImage} from 'electron';
-
 import path from 'path';
+
 import * as ConfigUtil from './utils/config-util';
 
 const {Tray, Menu, nativeImage, BrowserWindow} = remote;
diff --git a/app/renderer/js/utils/certificate-util.ts b/app/renderer/js/utils/certificate-util.ts
index 403c7ef7..560a4131 100644
--- a/app/renderer/js/utils/certificate-util.ts
+++ b/app/renderer/js/utils/certificate-util.ts
@@ -1,9 +1,10 @@
 import electron from 'electron';
-import {JsonDB} from 'node-json-db';
-import {initSetUp} from './default-util';
-
 import fs from 'fs';
 import path from 'path';
+
+import {JsonDB} from 'node-json-db';
+
+import {initSetUp} from './default-util';
 import Logger from './logger-util';
 
 const {app, dialog} =
diff --git a/app/renderer/js/utils/config-util.ts b/app/renderer/js/utils/config-util.ts
index 4977af6d..5131f99c 100644
--- a/app/renderer/js/utils/config-util.ts
+++ b/app/renderer/js/utils/config-util.ts
@@ -1,10 +1,11 @@
-import {JsonDB} from 'node-json-db';
-
+import electron from 'electron';
 import fs from 'fs';
 import path from 'path';
-import electron from 'electron';
-import Logger from './logger-util';
+
+import {JsonDB} from 'node-json-db';
+
 import * as EnterpriseUtil from './enterprise-util';
+import Logger from './logger-util';
 
 const logger = new Logger({
 	file: 'config-util.log',
diff --git a/app/renderer/js/utils/domain-util.ts b/app/renderer/js/utils/domain-util.ts
index 4d9bffe2..64be9ca0 100644
--- a/app/renderer/js/utils/domain-util.ts
+++ b/app/renderer/js/utils/domain-util.ts
@@ -1,12 +1,13 @@
-import {JsonDB} from 'node-json-db';
-
+import {remote, ipcRenderer} from 'electron';
 import fs from 'fs';
 import path from 'path';
-import Logger from './logger-util';
-import {remote, ipcRenderer} from 'electron';
+
+import {JsonDB} from 'node-json-db';
+
+import * as Messages from '../../../resources/messages';
 
 import * as EnterpriseUtil from './enterprise-util';
-import * as Messages from '../../../resources/messages';
+import Logger from './logger-util';
 
 const {app, dialog} = remote;
 
diff --git a/app/renderer/js/utils/link-util.ts b/app/renderer/js/utils/link-util.ts
index 10fad7fe..da3921c1 100644
--- a/app/renderer/js/utils/link-util.ts
+++ b/app/renderer/js/utils/link-util.ts
@@ -1,9 +1,10 @@
 import {shell} from 'electron';
-import escape from 'escape-html';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 
+import escape from 'escape-html';
+
 export function isUploadsUrl(server: string, url: URL): boolean {
 	return url.origin === server && url.pathname.startsWith('/user_uploads/');
 }
diff --git a/app/renderer/js/utils/linux-update-util.ts b/app/renderer/js/utils/linux-update-util.ts
index 55d8389e..eafe3312 100644
--- a/app/renderer/js/utils/linux-update-util.ts
+++ b/app/renderer/js/utils/linux-update-util.ts
@@ -1,8 +1,9 @@
-import {JsonDB} from 'node-json-db';
-
+import electron from 'electron';
 import fs from 'fs';
 import path from 'path';
-import electron from 'electron';
+
+import {JsonDB} from 'node-json-db';
+
 import Logger from './logger-util';
 
 const remote =
diff --git a/app/renderer/js/utils/logger-util.ts b/app/renderer/js/utils/logger-util.ts
index 44fb1b7f..a88b1f58 100644
--- a/app/renderer/js/utils/logger-util.ts
+++ b/app/renderer/js/utils/logger-util.ts
@@ -1,11 +1,12 @@
 import {Console} from 'console'; // eslint-disable-line node/prefer-global/console
-import {initSetUp} from './default-util';
-import {sentryInit, captureException} from './sentry-util';
-
+import electron from 'electron';
 import fs from 'fs';
 import os from 'os';
+
 import isDev from 'electron-is-dev';
-import electron from 'electron';
+
+import {initSetUp} from './default-util';
+import {sentryInit, captureException} from './sentry-util';
 
 interface LoggerOptions {
 	timestamp?: true | (() => string);
diff --git a/app/renderer/js/utils/reconnect-util.ts b/app/renderer/js/utils/reconnect-util.ts
index db0bc822..690f0a42 100644
--- a/app/renderer/js/utils/reconnect-util.ts
+++ b/app/renderer/js/utils/reconnect-util.ts
@@ -1,7 +1,9 @@
 import {ipcRenderer} from 'electron';
 
-import type WebView from '../components/webview';
 import backoff from 'backoff';
+
+import type WebView from '../components/webview';
+
 import Logger from './logger-util';
 
 const logger = new Logger({
diff --git a/app/renderer/js/utils/sentry-util.ts b/app/renderer/js/utils/sentry-util.ts
index 0059e75e..d78df796 100644
--- a/app/renderer/js/utils/sentry-util.ts
+++ b/app/renderer/js/utils/sentry-util.ts
@@ -1,5 +1,4 @@
 import {init} from '@sentry/electron';
-
 import isDev from 'electron-is-dev';
 
 export const sentryInit = (): void => {
diff --git a/app/renderer/js/utils/system-util.ts b/app/renderer/js/utils/system-util.ts
index 10b6a132..595235d5 100644
--- a/app/renderer/js/utils/system-util.ts
+++ b/app/renderer/js/utils/system-util.ts
@@ -1,5 +1,4 @@
 import {ipcRenderer} from 'electron';
-
 import os from 'os';
 
 export const connectivityERR: string[] = [
diff --git a/app/renderer/js/utils/translation-util.ts b/app/renderer/js/utils/translation-util.ts
index dbd700cd..de14c058 100644
--- a/app/renderer/js/utils/translation-util.ts
+++ b/app/renderer/js/utils/translation-util.ts
@@ -1,5 +1,7 @@
 import path from 'path';
+
 import i18n from 'i18n';
+
 import * as ConfigUtil from './config-util';
 
 i18n.configure({
diff --git a/gulpfile.js b/gulpfile.js
index 9a3a564d..801fcc26 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,16 +1,16 @@
 'use strict';
-const gulp = require('gulp');
+const {execSync} = require('child_process');
+
 const electron = require('electron-connect').server.create({
 	verbose: true
 });
-const tape = require('gulp-tape');
-const tapColorize = require('tap-colorize');
-const ts = require('gulp-typescript');
-const tsProject = ts.createProject('tsconfig.json');
-
 const glob = require('glob');
-const {execSync} = require('child_process');
+const gulp = require('gulp');
+const tape = require('gulp-tape');
+const ts = require('gulp-typescript');
+const tapColorize = require('tap-colorize');
 
+const tsProject = ts.createProject('tsconfig.json');
 const baseFilePattern = 'app/+(main|renderer)/**/*';
 const globOptions = {cwd: __dirname};
 const jsFiles = glob.sync(baseFilePattern + '.js', globOptions);
diff --git a/package.json b/package.json
index 82be40c7..3a8d075a 100644
--- a/package.json
+++ b/package.json
@@ -204,6 +204,16 @@
       "@typescript-eslint/no-dynamic-delete": "off",
       "@typescript-eslint/prefer-readonly-parameter-types": "off",
       "arrow-body-style": "error",
+      "import/first": "error",
+      "import/order": [
+        "error",
+        {
+          "alphabetize": {
+            "order": "asc"
+          },
+          "newlines-between": "always"
+        }
+      ],
       "import/unambiguous": "error",
       "max-lines": [
         "warn",
diff --git a/scripts/notarize.js b/scripts/notarize.js
index 32b8d6ab..503be32d 100644
--- a/scripts/notarize.js
+++ b/scripts/notarize.js
@@ -1,11 +1,11 @@
 'use strict';
 const path = require('path');
+
 const dotenv = require('dotenv');
+const {notarize} = require('electron-notarize');
 
 dotenv.config({path: path.join(__dirname, '/../.env')});
 
-const {notarize} = require('electron-notarize');
-
 exports.default = async function (context) {
 	const {electronPlatformName, appOutDir} = context;
 	if (electronPlatformName !== 'darwin') {
diff --git a/tests/index.js b/tests/index.js
index 58d0829c..0383f0fb 100644
--- a/tests/index.js
+++ b/tests/index.js
@@ -1,5 +1,6 @@
 'use strict';
 const test = require('tape');
+
 const setup = require('./setup');
 
 test('app runs', async t => {
diff --git a/tests/setup.js b/tests/setup.js
index 8ad113e7..ac3e1839 100644
--- a/tests/setup.js
+++ b/tests/setup.js
@@ -1,8 +1,9 @@
 'use strict';
-const {Application} = require('spectron');
 const fs = require('fs');
 const path = require('path');
+
 const rimraf = require('rimraf');
+const {Application} = require('spectron');
 
 const config = require('./config');
 
diff --git a/tests/test-add-organization.js b/tests/test-add-organization.js
index 54711a78..cdcd5ab0 100644
--- a/tests/test-add-organization.js
+++ b/tests/test-add-organization.js
@@ -1,5 +1,6 @@
 'use strict';
 const test = require('tape');
+
 const setup = require('./setup');
 
 test('add-organization', async t => {
diff --git a/tests/test-new-organization.js b/tests/test-new-organization.js
index 1ce6f029..d0fe4020 100644
--- a/tests/test-new-organization.js
+++ b/tests/test-new-organization.js
@@ -1,5 +1,6 @@
 'use strict';
 const test = require('tape');
+
 const setup = require('./setup');
 
 // Create new org link should open in the default browser [WIP]