diff --git a/app/src/actions/Global.ts b/app/src/actions/Global.ts
index 4d6b147..f23ecc7 100644
--- a/app/src/actions/Global.ts
+++ b/app/src/actions/Global.ts
@@ -9,4 +9,3 @@ export const showError = (error?: string) => ({
 export const didLaunch = () => ({
   type: ActionTypes.didLaunch,
 })
-
diff --git a/app/src/actions/Settings.ts b/app/src/actions/Settings.ts
index 0c3387a..e323a55 100644
--- a/app/src/actions/Settings.ts
+++ b/app/src/actions/Settings.ts
@@ -12,8 +12,8 @@ import {
   SettingsState,
   TopicOrder,
 } from '../reducers/Settings'
-import { Base64Message } from '../../../backend/src/Model/Base64Message';
-import { globalActions } from '.';
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import { globalActions } from '.'
 
 const settingsIdentifier: StorageIdentifier<Partial<SettingsState>> = {
   id: 'Settings',
diff --git a/app/src/components/BrokerStatistics.tsx b/app/src/components/BrokerStatistics.tsx
index a329828..dc8bc22 100644
--- a/app/src/components/BrokerStatistics.tsx
+++ b/app/src/components/BrokerStatistics.tsx
@@ -5,8 +5,8 @@ import { connect } from 'react-redux'
 import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
 import { TopicViewModel } from '../TopicViewModel'
 import { Typography } from '@material-ui/core'
-import { Base64Message } from '../../../backend/src/Model/Base64Message';
-import lime from '@material-ui/core/colors/teal'
+import { Base64Message } from '../../../backend/src/Model/Base64Message'
+import teal from '@material-ui/core/colors/teal'
 
 const abbreviate = require('number-abbreviate')
 
diff --git a/app/src/components/CodeBlockColors.ts b/app/src/components/CodeBlockColors.ts
index e3b9913..f5939f1 100644
--- a/app/src/components/CodeBlockColors.ts
+++ b/app/src/components/CodeBlockColors.ts
@@ -1,8 +1,8 @@
 export enum CodeBlockColors {
-  text = "#080808",
-  background = "#F9F9F9",
-  numeric = "#811F24",
-  boolean = "#811F24",
-  string = "#0B6125",
-  variable = "#234A97"
-}
\ No newline at end of file
+  text = '#080808',
+  background = '#F9F9F9',
+  numeric = '#811F24',
+  boolean = '#811F24',
+  string = '#0B6125',
+  variable = '#234A97',
+}
diff --git a/app/src/components/CodeDiff.tsx b/app/src/components/CodeDiff.tsx
index aba3cc7..f0cd545 100644
--- a/app/src/components/CodeDiff.tsx
+++ b/app/src/components/CodeDiff.tsx
@@ -4,7 +4,7 @@ import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
 import 'prismjs/components/prism-json'
 import 'prismjs/themes/prism-tomorrow.css'
-import { CodeBlockColors } from './CodeBlockColors';
+import { CodeBlockColors } from './CodeBlockColors'
 
 interface Props {
   previous: string
diff --git a/app/src/components/ContentView.tsx b/app/src/components/ContentView.tsx
index fc8da22..a579ff7 100644
--- a/app/src/components/ContentView.tsx
+++ b/app/src/components/ContentView.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react'
-import SplitPane from 'react-split-pane'
+import ReactSplitPane from 'react-split-pane'
 import { Sidebar } from './Sidebar'
-import Tree from './Tree/Tree';
+import Tree from './Tree/Tree'
 
 export default function ContentView(props: {heightProperty: any, paneDefaults: any, connectionId: any}) {
   return (
-    <SplitPane
+    <ReactSplitPane
       step={20}
       primary="second"
       className={props.heightProperty}
@@ -23,6 +23,6 @@ export default function ContentView(props: {heightProperty: any, paneDefaults: a
       <div className={props.paneDefaults}>
         <Sidebar connectionId={props.connectionId} />
       </div>
-    </SplitPane>
+    </ReactSplitPane>
   )
-}
\ No newline at end of file
+}
diff --git a/app/src/components/CustomIconButton.tsx b/app/src/components/CustomIconButton.tsx
index 7d38e7c..c6eb6dd 100644
--- a/app/src/components/CustomIconButton.tsx
+++ b/app/src/components/CustomIconButton.tsx
@@ -4,7 +4,7 @@ import { Theme, withStyles } from '@material-ui/core/styles'
 
 interface Props {
   onClick: any,
-  classes: any
+  classes: any,
 }
 
 const styles = (theme: Theme) => ({
diff --git a/app/src/components/Demo/ShowText.tsx b/app/src/components/Demo/ShowText.tsx
index a7a6101..ac90aa1 100644
--- a/app/src/components/Demo/ShowText.tsx
+++ b/app/src/components/Demo/ShowText.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { Theme, withStyles } from '@material-ui/core'
-import Key from './Key';
+import Key from './Key'
 
 interface State {
   message?: string
@@ -8,8 +8,6 @@ interface State {
   location: string
 }
 
-
-
 class Demo extends React.Component<{classes: any}, State> {
   private timer: any
   constructor(props: any) {
diff --git a/app/src/components/Demo/index.tsx b/app/src/components/Demo/index.tsx
index feeef4a..9f80f93 100644
--- a/app/src/components/Demo/index.tsx
+++ b/app/src/components/Demo/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import ShowText from './ShowText'
-import Mouse from './Mouse';
+import Mouse from './Mouse'
 
 (window as any).demo = {}
 
@@ -11,4 +11,4 @@ export default function render(props: any) {
       <Mouse />
     </span>
   )
-}
\ No newline at end of file
+}
diff --git a/app/src/components/PauseButton.tsx b/app/src/components/PauseButton.tsx
index fcdb06b..8b0920e 100644
--- a/app/src/components/PauseButton.tsx
+++ b/app/src/components/PauseButton.tsx
@@ -8,7 +8,7 @@ import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { treeActions } from '../actions'
 import { StyleRulesCallback, withStyles } from '@material-ui/core/styles'
-import { Tooltip } from '@material-ui/core';
+import { Tooltip } from '@material-ui/core'
 
 const styles: StyleRulesCallback = theme => ({ })
 
diff --git a/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx b/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx
index a58cd27..d219841 100644
--- a/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx
+++ b/app/src/components/Sidebar/ValueRenderer/MessageHistory.tsx
@@ -4,7 +4,7 @@ import BarChart from '@material-ui/icons/BarChart'
 import DateFormatter from '../../helper/DateFormatter'
 import History from '../History'
 import { TopicViewModel } from '../../../TopicViewModel'
-import { Base64Message } from '../../../../../backend/src/Model/Base64Message';
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
 
 const PlotHistory = React.lazy(() => import('./PlotHistory'))
 
diff --git a/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx b/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx
index 9ebd3a6..a093f02 100644
--- a/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx
+++ b/app/src/components/Sidebar/ValueRenderer/PlotHistory.tsx
@@ -3,7 +3,7 @@ import * as React from 'react'
 import DateFormatter from '../../helper/DateFormatter'
 import { default as ReactResizeDetector } from 'react-resize-detector'
 import 'react-vis/dist/style.css'
-import { Base64Message } from '../../../../../backend/src/Model/Base64Message';
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
 const { XYPlot, LineMarkSeries, Hint, YAxis, HorizontalGridLines } = require('react-vis')
 const abbreviate = require('number-abbreviate')
 
diff --git a/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx b/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx
index c0dc0e2..4e7a08d 100644
--- a/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx
+++ b/app/src/components/Sidebar/ValueRenderer/ValuePanel.tsx
@@ -11,6 +11,7 @@ import ToggleButton from '@material-ui/lab/ToggleButton'
 import ToggleButtonGroup from '@material-ui/lab/ToggleButtonGroup'
 import ValueRenderer from './ValueRenderer'
 import { AppState } from '../../../reducers'
+import { Base64Message } from '../../../../../backend/src/Model/Base64Message'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import { settingsActions, sidebarActions } from '../../../actions'
@@ -27,7 +28,6 @@ import {
   withStyles,
   Theme,
   } from '@material-ui/core'
-import { Base64Message } from '../../../../../backend/src/Model/Base64Message';
 
 interface Props {
   node?: q.TreeNode<any>
diff --git a/app/src/components/TitleBar.tsx b/app/src/components/TitleBar.tsx
index d2d436e..aabc4ee 100644
--- a/app/src/components/TitleBar.tsx
+++ b/app/src/components/TitleBar.tsx
@@ -18,7 +18,7 @@ import {
   Toolbar,
   Typography,
 } from '@material-ui/core'
-import PauseButton from './PauseButton';
+import PauseButton from './PauseButton'
 
 const styles: StyleRulesCallback = theme => ({
   title: {
diff --git a/app/src/components/Tree/TreeNodeTitle.tsx b/app/src/components/Tree/TreeNodeTitle.tsx
index a0e97d4..3a05cd3 100644
--- a/app/src/components/Tree/TreeNodeTitle.tsx
+++ b/app/src/components/Tree/TreeNodeTitle.tsx
@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import * as q from '../../../../backend/src/Model'
 import { withStyles, Theme } from '@material-ui/core'
 import { TopicViewModel } from '../../TopicViewModel'
-import { Base64Message } from '../../../../backend/src/Model/Base64Message';
+import { Base64Message } from '../../../../backend/src/Model/Base64Message'
 const debounce = require('lodash.debounce')
 
 export interface TreeNodeProps extends React.HTMLAttributes<HTMLElement> {
diff --git a/backend/src/DataSource/MqttSource.ts b/backend/src/DataSource/MqttSource.ts
index 4f50fa6..805bebb 100644
--- a/backend/src/DataSource/MqttSource.ts
+++ b/backend/src/DataSource/MqttSource.ts
@@ -3,7 +3,7 @@ import * as Url from 'url'
 import { Client, connect as mqttConnect } from 'mqtt'
 import { DataSource, DataSourceStateMachine } from './'
 import { MqttMessage } from '../../../events'
-import { Base64Message } from '../Model/Base64Message';
+import { Base64Message } from '../Model/Base64Message'
 
 export interface MqttOptions {
   url: string
diff --git a/backend/src/index.ts b/backend/src/index.ts
index 26d03b5..04eb832 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -15,7 +15,6 @@ import {
   updateAvailable,
 } from '../../events'
 
-
 export class ConnectionManager {
   private connections: {[s: string]: DataSource<any>} = {}
 
diff --git a/events/Events.ts b/events/Events.ts
index 8c9b9d9..0f9d305 100644
--- a/events/Events.ts
+++ b/events/Events.ts
@@ -1,7 +1,7 @@
 import { DataSourceState, MqttOptions } from '../backend/src/DataSource'
 
 import { UpdateInfo } from 'builder-util-runtime'
-import { Base64Message } from '../backend/src/Model/Base64Message';
+import { Base64Message } from '../backend/src/Model/Base64Message'
 
 export { UpdateInfo } from 'builder-util-runtime'
 
diff --git a/tslint.json b/tslint.json
index 7364ca6..8365357 100644
--- a/tslint.json
+++ b/tslint.json
@@ -8,6 +8,7 @@
     "align": false,
     "variable-name": false,
     "jsx-no-lambda": false,
-    "indent": [true, "spaces", 2]
+    "indent": [true, "spaces", 2],
+    "import-name": false
   }
 }