diff --git a/tabby-core/src/services/app.service.ts b/tabby-core/src/services/app.service.ts
index 80a0015e..b39e7c0c 100644
--- a/tabby-core/src/services/app.service.ts
+++ b/tabby-core/src/services/app.service.ts
@@ -1,5 +1,4 @@
-import { Observable, Subject, AsyncSubject } from 'rxjs'
-import { takeUntil } from 'rxjs/operators'
+import { Observable, Subject, AsyncSubject, takeUntil } from 'rxjs'
 import { Injectable, Inject } from '@angular/core'
 
 import { BaseTabComponent } from '../components/baseTab.component'
diff --git a/tabby-local/src/components/editProfileModal.component.ts b/tabby-local/src/components/editProfileModal.component.ts
index 1fd7daba..6f21a703 100644
--- a/tabby-local/src/components/editProfileModal.component.ts
+++ b/tabby-local/src/components/editProfileModal.component.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Observable, OperatorFunction } from 'rxjs'
-import { debounceTime, map, distinctUntilChanged } from 'rxjs/operators'
+import { Observable, OperatorFunction, debounceTime, map, distinctUntilChanged } from 'rxjs'
 import { Component, Input, ViewChild, ViewContainerRef, ComponentFactoryResolver, Injector } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { UACService } from '../services/uac.service'
diff --git a/tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts
index 5b20e214..2f08c150 100644
--- a/tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts
+++ b/tabby-plugin-manager/src/components/pluginsSettingsTab.component.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { BehaviorSubject, Observable } from 'rxjs'
-import { debounceTime, distinctUntilChanged, first, tap, flatMap, map } from 'rxjs/operators'
+import { BehaviorSubject, Observable, debounceTime, distinctUntilChanged, first, tap, flatMap, map } from 'rxjs'
 import semverGt from 'semver/functions/gt'
 
 import { Component, Input } from '@angular/core'
diff --git a/tabby-plugin-manager/src/services/pluginManager.service.ts b/tabby-plugin-manager/src/services/pluginManager.service.ts
index 87cae2fe..3a30e80c 100644
--- a/tabby-plugin-manager/src/services/pluginManager.service.ts
+++ b/tabby-plugin-manager/src/services/pluginManager.service.ts
@@ -1,6 +1,5 @@
 import axios from 'axios'
-import { Observable, from, forkJoin } from 'rxjs'
-import { map } from 'rxjs/operators'
+import { Observable, from, forkJoin, map } from 'rxjs'
 import { Injectable, Inject } from '@angular/core'
 import { Logger, LogService, PlatformService, BOOTSTRAP_DATA, BootstrapData, PluginInfo } from 'tabby-core'
 
diff --git a/tabby-serial/src/components/serialProfileSettings.component.ts b/tabby-serial/src/components/serialProfileSettings.component.ts
index 2c91838f..d72e2f3e 100644
--- a/tabby-serial/src/components/serialProfileSettings.component.ts
+++ b/tabby-serial/src/components/serialProfileSettings.component.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { Component } from '@angular/core'
-import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'
+import { debounceTime, distinctUntilChanged, map } from 'rxjs'
 import { ProfileSettingsComponent } from 'tabby-core'
 import { SerialPortInfo, BAUD_RATES, SerialProfile } from '../api'
 import { SerialService } from '../services/serial.service'
diff --git a/tabby-serial/src/components/serialTab.component.ts b/tabby-serial/src/components/serialTab.component.ts
index 32541fc5..494b8af7 100644
--- a/tabby-serial/src/components/serialTab.component.ts
+++ b/tabby-serial/src/components/serialTab.component.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import colors from 'ansi-colors'
 import { Component, Injector } from '@angular/core'
-import { first } from 'rxjs/operators'
+import { first } from 'rxjs'
 import { SelectorService } from 'tabby-core'
 import { BaseTerminalTabComponent } from 'tabby-terminal'
 import { SerialSession, BAUD_RATES, SerialProfile } from '../api'
diff --git a/tabby-ssh/src/components/sshTab.component.ts b/tabby-ssh/src/components/sshTab.component.ts
index afe827b8..9577a7b1 100644
--- a/tabby-ssh/src/components/sshTab.component.ts
+++ b/tabby-ssh/src/components/sshTab.component.ts
@@ -1,7 +1,7 @@
 import colors from 'ansi-colors'
 import { Component, Injector, HostListener } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { first } from 'rxjs/operators'
+import { first } from 'rxjs'
 import { Platform, RecoveryToken } from 'tabby-core'
 import { BaseTerminalTabComponent } from 'tabby-terminal'
 import { SSHService } from '../services/ssh.service'
diff --git a/tabby-telnet/src/components/telnetTab.component.ts b/tabby-telnet/src/components/telnetTab.component.ts
index 710731c3..6ad6034b 100644
--- a/tabby-telnet/src/components/telnetTab.component.ts
+++ b/tabby-telnet/src/components/telnetTab.component.ts
@@ -1,6 +1,6 @@
 import colors from 'ansi-colors'
 import { Component, Injector } from '@angular/core'
-import { first } from 'rxjs/operators'
+import { first } from 'rxjs'
 import { Platform, RecoveryToken } from 'tabby-core'
 import { BaseTerminalTabComponent } from 'tabby-terminal'
 import { TelnetProfile, TelnetSession } from '../session'
diff --git a/tabby-terminal/src/api/baseTerminalTab.component.ts b/tabby-terminal/src/api/baseTerminalTab.component.ts
index 0c2ee8e9..2557be65 100644
--- a/tabby-terminal/src/api/baseTerminalTab.component.ts
+++ b/tabby-terminal/src/api/baseTerminalTab.component.ts
@@ -1,5 +1,4 @@
-import { Observable, Subject, Subscription } from 'rxjs'
-import { first } from 'rxjs/operators'
+import { Observable, Subject, Subscription, first } from 'rxjs'
 import { Spinner } from 'cli-spinner'
 import colors from 'ansi-colors'
 import { NgZone, OnInit, OnDestroy, Injector, ViewChild, HostBinding, Input, ElementRef, InjectFlags } from '@angular/core'
diff --git a/tabby-terminal/src/api/streamProcessing.ts b/tabby-terminal/src/api/streamProcessing.ts
index 33f83b88..ea1c4413 100644
--- a/tabby-terminal/src/api/streamProcessing.ts
+++ b/tabby-terminal/src/api/streamProcessing.ts
@@ -2,8 +2,7 @@ import hexdump from 'hexer'
 import bufferReplace from 'buffer-replace'
 import colors from 'ansi-colors'
 import binstring from 'binstring'
-import { Subject, Observable, interval } from 'rxjs'
-import { debounce } from 'rxjs/operators'
+import { Subject, Observable, interval, debounce } from 'rxjs'
 import { PassThrough, Readable, Writable } from 'stream'
 import { ReadLine, createInterface as createReadline, clearLine } from 'readline'
 
diff --git a/tabby-terminal/src/components/appearanceSettingsTab.component.ts b/tabby-terminal/src/components/appearanceSettingsTab.component.ts
index f192cd74..52192a68 100644
--- a/tabby-terminal/src/components/appearanceSettingsTab.component.ts
+++ b/tabby-terminal/src/components/appearanceSettingsTab.component.ts
@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
-import { Observable } from 'rxjs'
+import { Observable, debounceTime, distinctUntilChanged, map } from 'rxjs'
 import { debounce } from 'utils-decorators/dist/cjs'
-import { debounceTime, distinctUntilChanged, map } from 'rxjs/operators'
 
 import { Component } from '@angular/core'
 import { ConfigService, getCSSFontFamily, PlatformService } from 'tabby-core'
diff --git a/tabby-terminal/src/features/zmodem.ts b/tabby-terminal/src/features/zmodem.ts
index 2a418736..445071be 100644
--- a/tabby-terminal/src/features/zmodem.ts
+++ b/tabby-terminal/src/features/zmodem.ts
@@ -1,7 +1,6 @@
 import colors from 'ansi-colors'
 import * as ZModem from 'zmodem.js'
-import { Observable } from 'rxjs'
-import { filter, first } from 'rxjs/operators'
+import { Observable, filter, first } from 'rxjs'
 import { Injectable } from '@angular/core'
 import { TerminalDecorator } from '../api/decorator'
 import { BaseTerminalTabComponent } from '../api/baseTerminalTab.component'