diff --git a/src/Terminal.ts b/src/Terminal.ts
index 5bc6c6a6..3608b3bf 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -44,9 +44,8 @@ import { AccessibilityManager } from './AccessibilityManager';
 import { ITheme, IMarker, IDisposable, ISelectionPosition } from 'xterm';
 import { removeTerminalFromCache } from './renderer/atlas/CharAtlasCache';
 import { DomRenderer } from './renderer/dom/DomRenderer';
-import { IKeyboardEvent } from 'common/Types';
+import { IKeyboardEvent, KeyboardResultType, ICharset, IBufferLine, IAttributeData } from 'common/Types';
 import { evaluateKeyboardEvent } from 'common/input/Keyboard';
-import { KeyboardResultType, ICharset, IBufferLine, IAttributeData } from 'common/Types';
 import { EventEmitter2, IEvent } from 'common/EventEmitter2';
 import { Attributes, DEFAULT_ATTR_DATA } from 'common/buffer/BufferLine';
 import { applyWindowsMode } from './WindowsMode';
diff --git a/src/TestUtils.test.ts b/src/TestUtils.test.ts
index eb2f43fc..914477ca 100644
--- a/src/TestUtils.test.ts
+++ b/src/TestUtils.test.ts
@@ -5,8 +5,7 @@
 
 import { IRenderer, IRenderDimensions } from './renderer/Types';
 import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminal, IBuffer, IBufferSet, IBrowser, ISelectionManager, ITerminalOptions, ILinkifier, IMouseHelper, ILinkMatcherOptions, CharacterJoinerHandler, IBufferStringIterator } from './Types';
-import { IBufferLine, ICellData, IAttributeData } from 'common/Types';
-import { ICircularList, XtermListener } from 'common/Types';
+import { IBufferLine, ICellData, IAttributeData, ICircularList, XtermListener } from 'common/Types';
 import { Buffer } from './Buffer';
 import * as Browser from 'common/Platform';
 import { IDisposable, IMarker, IEvent, ISelectionPosition } from 'xterm';
diff --git a/src/Types.ts b/src/Types.ts
index c0ce984a..b5c2bd29 100644
--- a/src/Types.ts
+++ b/src/Types.ts
@@ -4,8 +4,7 @@
  */
 
 import { ITerminalOptions as IPublicTerminalOptions, IEventEmitter, IDisposable, IMarker, ISelectionPosition } from 'xterm';
-import { ICharset, IAttributeData, ICellData, IBufferLine, CharData } from 'common/Types';
-import { ICircularList } from 'common/Types';
+import { ICharset, IAttributeData, ICellData, IBufferLine, CharData, ICircularList } from 'common/Types';
 import { IEvent } from 'common/EventEmitter2';
 import { IColorSet } from 'ui/Types';
 import { IOptionsService } from 'common/services/Services';
diff --git a/src/renderer/BaseRenderLayer.ts b/src/renderer/BaseRenderLayer.ts
index 4b31e270..b5836ed9 100644
--- a/src/renderer/BaseRenderLayer.ts
+++ b/src/renderer/BaseRenderLayer.ts
@@ -5,8 +5,7 @@
 
 import { IRenderLayer, IRenderDimensions } from './Types';
 import { ITerminal } from '../Types';
-import { ICellData } from 'common/Types';
-import { DEFAULT_COLOR } from 'common/Types';
+import { ICellData, DEFAULT_COLOR } from 'common/Types';
 import { DIM_OPACITY, INVERTED_DEFAULT_COLOR, IGlyphIdentifier } from './atlas/Types';
 import { BaseCharAtlas } from './atlas/BaseCharAtlas';
 import { acquireCharAtlas } from './atlas/CharAtlasCache';