diff --git a/.cspell.json b/.cspell.json
index 836f16f..360993f 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -44,6 +44,7 @@
     "DEVTOOLS",
     "mixins",
     "Explorerdmg",
-    "heapsnapshot"
+    "heapsnapshot",
+    "noconflict"
   ]
 }
diff --git a/app/src/actions/Charts.ts b/app/src/actions/Charts.ts
index e93bfe6..ed89d6f 100644
--- a/app/src/actions/Charts.ts
+++ b/app/src/actions/Charts.ts
@@ -67,7 +67,7 @@ export const addChart = (chartParameters: ChartParameters) => async (
   const chartExists = Boolean(
     getState()
       .charts.get('charts')
-      .find((chart) => chart.topic === chartParameters.topic && chart.dotPath === chartParameters.dotPath)
+      .find(chart => chart.topic === chartParameters.topic && chart.dotPath === chartParameters.dotPath)
   )
   if (chartExists) {
     dispatch(showNotification('Already added'))
diff --git a/app/src/actions/Connection.ts b/app/src/actions/Connection.ts
index 0c1801a..a2e0d23 100644
--- a/app/src/actions/Connection.ts
+++ b/app/src/actions/Connection.ts
@@ -20,7 +20,7 @@ export const connect = (options: MqttOptions, connectionId: string) => (
   const event = makeConnectionStateEvent(connectionId)
   const host = url.parse(options.url).hostname
 
-  rendererEvents.subscribe(event, (dataSourceState) => {
+  rendererEvents.subscribe(event, dataSourceState => {
     if (dataSourceState.connected) {
       const didReconnect = Boolean(getState().connection.tree)
       if (!didReconnect) {
diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts
index 8fa274c..f11e850 100644
--- a/app/src/actions/ConnectionManager.ts
+++ b/app/src/actions/ConnectionManager.ts
@@ -146,7 +146,7 @@ export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<an
   const connectionIds = Object.keys(getState().connectionManager.connections)
   const connectionIdLocation = connectionIds.indexOf(connectionId)
 
-  const remainingIds = connectionIds.filter((id) => id !== connectionId)
+  const remainingIds = connectionIds.filter(id => id !== connectionId)
   const nextSelectedConnectionIndex = Math.min(remainingIds.length - 1, connectionIdLocation)
   const nextSelectedConnection = remainingIds[nextSelectedConnectionIndex]
 
diff --git a/app/src/actions/Global.ts b/app/src/actions/Global.ts
index 30f96fa..a1b3a67 100644
--- a/app/src/actions/Global.ts
+++ b/app/src/actions/Global.ts
@@ -22,7 +22,7 @@ export const toggleSettingsVisibility = () => (dispatch: Dispatch<any>) => {
 }
 
 export const requestConfirmation = (title: string, inquiry: string) => (dispatch: Dispatch<any>) => {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     const confirmationRequest = {
       title,
       inquiry,
diff --git a/app/src/actions/clearTopic.ts b/app/src/actions/clearTopic.ts
index 939cbe6..068662b 100644
--- a/app/src/actions/clearTopic.ts
+++ b/app/src/actions/clearTopic.ts
@@ -40,8 +40,8 @@ export const clearTopic = (topic: q.TreeNode<any>, recursive: boolean) => async
   const publishEvent = makePublishEvent(connectionId)
 
   topicsForPurging
-    .filter((t) => t.path() !== '' && t.hasMessage())
-    .map((t) => t.path())
+    .filter(t => t.path() !== '' && t.hasMessage())
+    .map(t => t.path())
     .forEach((path, idx) => {
       const mqttMessage = {
         topic: path,
diff --git a/app/src/actions/visibleTreeTraversal.ts b/app/src/actions/visibleTreeTraversal.ts
index cbcbfee..233e22e 100644
--- a/app/src/actions/visibleTreeTraversal.ts
+++ b/app/src/actions/visibleTreeTraversal.ts
@@ -82,7 +82,7 @@ function findNextNodeUpward(
   }
 
   const neighborNodes = sortedNodes(settings, parent)
-  const nodeIdx = neighborNodes.findIndex((n) => n.path() === treeNode.path())
+  const nodeIdx = neighborNodes.findIndex(n => n.path() === treeNode.path())
   if (nodeIdx === 0) {
     return parent
   }
@@ -125,7 +125,7 @@ function findNextNodeDownwardNeighbor(
   }
 
   const neighborNodes = sortedNodes(settings, parent).filter(isTreeNodeVisible)
-  const nodeIdx = neighborNodes.findIndex((n) => n.path() === treeNode.path())
+  const nodeIdx = neighborNodes.findIndex(n => n.path() === treeNode.path())
   const downwardNeighbor = neighborNodes[nodeIdx + 1]
   if (downwardNeighbor) {
     return downwardNeighbor
diff --git a/app/src/components/Chart/Chart.tsx b/app/src/components/Chart/Chart.tsx
index 595458b..a438680 100644
--- a/app/src/components/Chart/Chart.tsx
+++ b/app/src/components/Chart/Chart.tsx
@@ -28,7 +28,7 @@ export default withTheme(
   memo((props: Props) => {
     const [width, setWidth] = React.useState(300)
     const [tooltip, setTooltip] = React.useState<Tooltip | undefined>()
-    const detectResize = React.useCallback((newWidth) => setWidth(newWidth), [])
+    const detectResize = React.useCallback(newWidth => setWidth(newWidth), [])
 
     const hintFormatter = React.useCallback(
       (point: any) => [
diff --git a/app/src/components/Chart/effects/useCustomYDomain.tsx b/app/src/components/Chart/effects/useCustomYDomain.tsx
index 0d64361..dfabe86 100644
--- a/app/src/components/Chart/effects/useCustomYDomain.tsx
+++ b/app/src/components/Chart/effects/useCustomYDomain.tsx
@@ -27,7 +27,7 @@ function domainForData(data: Array<Point>): [number, number] {
   let max = data[0].y
   let min = data[0].y
 
-  data.forEach((d) => {
+  data.forEach(d => {
     if (max < d.y) {
       max = d.y
     }
diff --git a/app/src/components/ChartPanel/ChartSettings/ColorSettings.tsx b/app/src/components/ChartPanel/ChartSettings/ColorSettings.tsx
index 7d7862a..53e614a 100644
--- a/app/src/components/ChartPanel/ChartSettings/ColorSettings.tsx
+++ b/app/src/components/ChartPanel/ChartSettings/ColorSettings.tsx
@@ -31,7 +31,7 @@ function ColorSettings(props: {
   )
 
   const menuItems = React.useMemo(() => {
-    return colors.map((color) => (
+    return colors.map(color => (
       <MenuItem
         style={{ minWidth: '8em', minHeight: '36px', backgroundColor: color, textAlign: 'center' }}
         key={color}
diff --git a/app/src/components/ChartPanel/ChartSettings/InterpolationSettings.tsx b/app/src/components/ChartPanel/ChartSettings/InterpolationSettings.tsx
index 068d61f..8974009 100644
--- a/app/src/components/ChartPanel/ChartSettings/InterpolationSettings.tsx
+++ b/app/src/components/ChartPanel/ChartSettings/InterpolationSettings.tsx
@@ -38,7 +38,7 @@ function InterpolationSettings(props: {
   }, [curves])
 
   const menuItems = React.useMemo(() => {
-    return curves.map((curve) => (
+    return curves.map(curve => (
       <MenuItem key={curve} onClick={callbacks[curve]} selected={props.chart.interpolation === curve}>
         <Typography variant="inherit">{curve.replace(/_/g, ' ')}</Typography>
       </MenuItem>
diff --git a/app/src/components/ChartPanel/ChartSettings/TimeRangeSettings.tsx b/app/src/components/ChartPanel/ChartSettings/TimeRangeSettings.tsx
index 162d26e..d3e0292 100644
--- a/app/src/components/ChartPanel/ChartSettings/TimeRangeSettings.tsx
+++ b/app/src/components/ChartPanel/ChartSettings/TimeRangeSettings.tsx
@@ -58,7 +58,7 @@ function TimeRangeSettings(props: Props) {
       >
         <Typography>Chart data within a time interval</Typography>
         <div style={{ padding: '0 16px', width: '275px', textAlign: 'center' }}>
-          {ranges.map((r) => {
+          {ranges.map(r => {
             return (
               <Button
                 style={{ margin: '4px', textTransform: 'none' }}
diff --git a/app/src/components/ChartPanel/ChartSettings/colors.ts b/app/src/components/ChartPanel/ChartSettings/colors.ts
index 8e30952..4611837 100644
--- a/app/src/components/ChartPanel/ChartSettings/colors.ts
+++ b/app/src/components/ChartPanel/ChartSettings/colors.ts
@@ -39,7 +39,7 @@ export function colors() {
     indigo,
     yellow,
   ]
-    .map((color) => [color[200], color[500], color[700]])
+    .map(color => [color[200], color[500], color[700]])
     .reduce((a, b) => a.concat(b), [])
     .sort((a, b) => colorCompare(a, b))
   return colors
diff --git a/app/src/components/ChartPanel/index.tsx b/app/src/components/ChartPanel/index.tsx
index 772a681..c0c8622 100644
--- a/app/src/components/ChartPanel/index.tsx
+++ b/app/src/components/ChartPanel/index.tsx
@@ -63,7 +63,7 @@ function ChartPanel(props: Props) {
     }
   }, [chartsInView])
 
-  const charts = props.charts.map((chartParameters) => (
+  const charts = props.charts.map(chartParameters => (
     <CSSTransition
       key={`${chartParameters.topic}-${chartParameters.dotPath || ''}`}
       timeout={{ enter: 500, exit: 500 }}
diff --git a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
index 04bce9e..250c37b 100644
--- a/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
+++ b/app/src/components/ConnectionSetup/AdvancedConnectionSettings.tsx
@@ -36,7 +36,7 @@ class ConnectionSettings extends React.Component<Props, State> {
 
   private renderSubscriptions() {
     const connection = this.props.connection
-    return connection.subscriptions.map((subscription) => (
+    return connection.subscriptions.map(subscription => (
       <Subscription
         deleteAction={() => this.props.managerActions.deleteSubscription(subscription, connection.id)}
         subscription={subscription}
diff --git a/app/src/components/ConnectionSetup/ProfileList/index.tsx b/app/src/components/ConnectionSetup/ProfileList/index.tsx
index a019086..eb76fc1 100644
--- a/app/src/components/ConnectionSetup/ProfileList/index.tsx
+++ b/app/src/components/ConnectionSetup/ProfileList/index.tsx
@@ -27,7 +27,7 @@ function ProfileList(props: Props) {
     }
     const indexDirection = dir === 'next' ? 1 : -1
     const connectionArray = Object.values(connections)
-    const selectedIndex = connectionArray.map((connection) => connection.id).indexOf(selected)
+    const selectedIndex = connectionArray.map(connection => connection.id).indexOf(selected)
     const nextConnection = connectionArray[selectedIndex + indexDirection]
     if (nextConnection) {
       actions.selectConnection(nextConnection.id)
@@ -48,7 +48,7 @@ function ProfileList(props: Props) {
   return (
     <List style={{ height: '100%' }} component="nav" subheader={createConnectionButton}>
       <div className={classes.list}>
-        {Object.values(connections).map((connection) => (
+        {Object.values(connections).map(connection => (
           <ConnectionItem connection={connection} key={connection.id} selected={selected === connection.id} />
         ))}
       </div>
diff --git a/app/src/components/Demo/ShowText.tsx b/app/src/components/Demo/ShowText.tsx
index b0c8c86..c6d212e 100644
--- a/app/src/components/Demo/ShowText.tsx
+++ b/app/src/components/Demo/ShowText.tsx
@@ -65,7 +65,7 @@ class Demo extends React.Component<{ classes: any }, State> {
     let keys: Array<any> = []
     if (this.state.keys.length > 0) {
       keys = this.state.keys
-        .map((key) => [<Key key={key} keyboardKey={key} />])
+        .map(key => [<Key key={key} keyboardKey={key} />])
         .reduce((prev, current) => {
           return [prev, '+' as any, current]
         })
diff --git a/app/src/components/Layout/ContentView.tsx b/app/src/components/Layout/ContentView.tsx
index c732702..bec1f83 100644
--- a/app/src/components/Layout/ContentView.tsx
+++ b/app/src/components/Layout/ContentView.tsx
@@ -25,7 +25,7 @@ function ContentView(props: Props) {
     setDetectedHeight(newHeight)
   }, [])
 
-  const detectSidebarSize = React.useCallback((width) => {
+  const detectSidebarSize = React.useCallback(width => {
     setDetectedSidebarWidth(width)
   }, [])
 
diff --git a/app/src/components/Layout/SearchBar.tsx b/app/src/components/Layout/SearchBar.tsx
index f284a2b..ba3dffe 100644
--- a/app/src/components/Layout/SearchBar.tsx
+++ b/app/src/components/Layout/SearchBar.tsx
@@ -33,7 +33,7 @@ function SearchBar(props: {
     actions.settings.filterTopics(event.target.value)
   }, [])
 
-  useGlobalKeyEventHandler(undefined, (event) => {
+  useGlobalKeyEventHandler(undefined, event => {
     const isCharacter = event.key.length === 1
     const isModifierKey = event.metaKey || event.ctrlKey
     const isAllowedControlCharacter = event.keyCode === KeyCodes.backspace || event.keyCode === KeyCodes.delete
diff --git a/app/src/components/SettingsDrawer/Settings.tsx b/app/src/components/SettingsDrawer/Settings.tsx
index 266e984..8e82538 100644
--- a/app/src/components/SettingsDrawer/Settings.tsx
+++ b/app/src/components/SettingsDrawer/Settings.tsx
@@ -143,7 +143,7 @@ class Settings extends React.PureComponent<Props, {}> {
   private renderAutoExpand() {
     const { classes, autoExpandLimit } = this.props
 
-    const limits = autoExpandLimitSet.map((limit) => (
+    const limits = autoExpandLimitSet.map(limit => (
       <MenuItem key={limit.limit} value={limit.limit}>
         {limit.limit < 10000 && limit.limit > 0 ? `≤ ${limit.limit} topics` : limit.name}
       </MenuItem>
diff --git a/app/src/components/SettingsDrawer/TimeLocale.tsx b/app/src/components/SettingsDrawer/TimeLocale.tsx
index 991124b..802a690 100644
--- a/app/src/components/SettingsDrawer/TimeLocale.tsx
+++ b/app/src/components/SettingsDrawer/TimeLocale.tsx
@@ -47,7 +47,7 @@ function TimeLocaleSettings(props: Props) {
         input={<Input name="time-locale" id="time-locale-label-placeholder" />}
         name="time-locale"
         className={classes.input}
-        renderValue={(v) => <span>{String(v)}</span>}
+        renderValue={v => <span>{String(v)}</span>}
         style={{ flex: '1' }}
       >
         {localeMenuItems}
diff --git a/app/src/components/Sidebar/CodeDiff/DiffCount.tsx b/app/src/components/Sidebar/CodeDiff/DiffCount.tsx
index 7615aaa..f891f7e 100644
--- a/app/src/components/Sidebar/CodeDiff/DiffCount.tsx
+++ b/app/src/components/Sidebar/CodeDiff/DiffCount.tsx
@@ -9,11 +9,9 @@ interface Props {
 }
 
 function changeAmount(props: Props) {
-  const additions = props.changes
-    .map((change) => (change.added === true ? change.count || 0 : 0))
-    .reduce((a, b) => a + b)
+  const additions = props.changes.map(change => (change.added === true ? change.count || 0 : 0)).reduce((a, b) => a + b)
   const deletions = props.changes
-    .map((change) => (change.removed === true ? change.count || 0 : 0))
+    .map(change => (change.removed === true ? change.count || 0 : 0))
     .reduce((a, b) => a + b)
   if (additions === 0 && deletions === 0) {
     return null
diff --git a/app/src/components/Sidebar/Publish/Publish.tsx b/app/src/components/Sidebar/Publish/Publish.tsx
index 342c0eb..3f29d27 100644
--- a/app/src/components/Sidebar/Publish/Publish.tsx
+++ b/app/src/components/Sidebar/Publish/Publish.tsx
@@ -30,7 +30,7 @@ function useHistory(): [Array<Message>, (topic: string, payload?: string) => voi
   const amendToHistory = useCallback(
     (topic: string, payload?: string) => {
       // Remove duplicates
-      let filteredHistory = history.filter((e) => e.payload !== payload || e.topic !== topic)
+      let filteredHistory = history.filter(e => e.payload !== payload || e.topic !== topic)
       filteredHistory = filteredHistory.slice(-7)
       setHistory([...filteredHistory, { topic, payload, sent: new Date() }])
     },
@@ -157,12 +157,9 @@ const PublishButton = (props: { publish: () => void }) => {
     [props.publish]
   )
 
-  const onFocus = useCallback(
-    (e: React.FocusEvent<HTMLElement>) => {
-      (e.relatedTarget as HTMLElement|null)?.focus()
-    },
-    []
-  )
+  const onFocus = useCallback((e: React.FocusEvent<HTMLElement>) => {
+    ;(e.relatedTarget as HTMLElement | null)?.focus()
+  }, [])
 
   return useMemo(
     () => (
diff --git a/app/src/components/Sidebar/Publish/PublishHistory.tsx b/app/src/components/Sidebar/Publish/PublishHistory.tsx
index 22d8937..f932d5d 100644
--- a/app/src/components/Sidebar/Publish/PublishHistory.tsx
+++ b/app/src/components/Sidebar/Publish/PublishHistory.tsx
@@ -18,7 +18,7 @@ function PublishHistory(props: { history: Array<Message>; actions: typeof publis
   )
 
   return useMemo(() => {
-    const items = [...props.history].reverse().map((message) => ({
+    const items = [...props.history].reverse().map(message => ({
       key: sha1(message.topic + message.payload),
       title: message.topic,
       value: message.payload || '',
diff --git a/app/src/components/Sidebar/TopicPanel/Topic.tsx b/app/src/components/Sidebar/TopicPanel/Topic.tsx
index 8b180c6..7ad2b77 100644
--- a/app/src/components/Sidebar/TopicPanel/Topic.tsx
+++ b/app/src/components/Sidebar/TopicPanel/Topic.tsx
@@ -33,9 +33,9 @@ class Topic extends React.PureComponent<Props, {}> {
     let key = 0
     const breadCrumps = node
       .branch()
-      .map((node) => node.sourceEdge)
-      .filter((edge) => Boolean(edge))
-      .map((edge) => [
+      .map(node => node.sourceEdge)
+      .filter(edge => Boolean(edge))
+      .map(edge => [
         <Button
           onClick={() => this.props.actions.selectTopic(edge!.target)}
           size="small"
diff --git a/app/src/components/TopicPlot.tsx b/app/src/components/TopicPlot.tsx
index 1d8202c..e76a179 100644
--- a/app/src/components/TopicPlot.tsx
+++ b/app/src/components/TopicPlot.tsx
@@ -19,7 +19,7 @@ interface Props {
 function filterUsingTimeRange(startTime: number | undefined, data: Array<q.Message>) {
   if (startTime) {
     const threshold = new Date(Date.now() - startTime)
-    return data.filter((d) => d.received >= threshold)
+    return data.filter(d => d.received >= threshold)
   }
 
   return data
@@ -31,7 +31,7 @@ function nodeToHistory(startTime: number | undefined, history: q.MessageHistory)
       const value = message.value ? toPlottableValue(Base64Message.toUnicodeString(message.value)) : NaN
       return { x: message.received.getTime(), y: toPlottableValue(value) }
     })
-    .filter((data) => !isNaN(data.y as any)) as any
+    .filter(data => !isNaN(data.y as any)) as any
 }
 
 function nodeDotPathToHistory(startTime: number | undefined, history: q.MessageHistory, dotPath: string) {
@@ -46,7 +46,7 @@ function nodeDotPathToHistory(startTime: number | undefined, history: q.MessageH
 
       return { x: message.received.getTime(), y: toPlottableValue(value) }
     })
-    .filter((data) => !isNaN(data.y as any)) as any
+    .filter(data => !isNaN(data.y as any)) as any
 }
 
 function TopicPlot(props: Props) {
diff --git a/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx b/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx
index b843108..55c67e1 100644
--- a/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx
+++ b/app/src/components/Tree/TreeNode/TreeNodeSubnodes.tsx
@@ -48,7 +48,7 @@ function TreeNodeSubnodes(props: Props) {
 
   return useMemo(() => {
     const nodes = sortedNodes(props.settings, props.treeNode).slice(0, alreadyAdded)
-    const listItems = nodes.map((node) => {
+    const listItems = nodes.map(node => {
       return (
         <TreeNode
           key={`${node.hash()}-${props.filter}`}
diff --git a/app/src/components/UpdateNotifier.tsx b/app/src/components/UpdateNotifier.tsx
index b1830a9..1687534 100644
--- a/app/src/components/UpdateNotifier.tsx
+++ b/app/src/components/UpdateNotifier.tsx
@@ -51,10 +51,10 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
     this.state = { newerVersions: [] }
 
     const ownVersion = electron.remote.app.getVersion()
-    this.fetchReleases().then((releases) => {
+    this.fetchReleases().then(releases => {
       const newerVersions = releases
-        .filter((release) => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion))
-        .filter((release) => compareVersions(release.tag_name, ownVersion) > 0)
+        .filter(release => this.allowPrereleaseIfOwnVersionIsBeta(release, ownVersion))
+        .filter(release => compareVersions(release.tag_name, ownVersion) > 0)
         .sort((a, b) => compareVersions(b.tag_name, a.tag_name))
 
       if (newerVersions.length > 0) {
@@ -145,7 +145,7 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
       return null
     }
     const releaseNotes = this.state.newerVersions
-      .map((release) => `<p><h3>${release.tag_name}</h3><p/><p>${release.body_html}</p>`)
+      .map(release => `<p><h3>${release.tag_name}</h3><p/><p>${release.body_html}</p>`)
       .join('<hr />')
 
     return (
@@ -195,7 +195,7 @@ class UpdateNotifier extends React.PureComponent<Props, State> {
       return null
     }
 
-    return latestUpdate.assets.filter(this.assetForCurrentPlatform).map((asset) => (
+    return latestUpdate.assets.filter(this.assetForCurrentPlatform).map(asset => (
       <div>
         <Button className={this.props.classes.download} onClick={() => this.openUrl(asset.browser_download_url)}>
           <CloudDownload />
diff --git a/app/src/components/helper/ConnectionHealthIndicator.tsx b/app/src/components/helper/ConnectionHealthIndicator.tsx
index b4bfe3f..0084d63 100644
--- a/app/src/components/helper/ConnectionHealthIndicator.tsx
+++ b/app/src/components/helper/ConnectionHealthIndicator.tsx
@@ -20,7 +20,7 @@ const styles = (theme: Theme) => ({
   icon: {
     boxShadow: theme.shadows[2]
       .split('),')
-      .map((s) => `inset ${s}`)
+      .map(s => `inset ${s}`)
       .join('),'),
     padding: '6px',
     borderRadius: '50%',
diff --git a/app/src/reducers/Charts.ts b/app/src/reducers/Charts.ts
index 039f0d9..47644bc 100644
--- a/app/src/reducers/Charts.ts
+++ b/app/src/reducers/Charts.ts
@@ -81,7 +81,7 @@ function addChart(state: ChartsState, action: AddChart) {
 
 function moveUp(state: ChartsState, action: MoveUp) {
   const charts = state.get('charts')
-  const idx = charts.findIndex((chart) => chart.topic === action.topic && chart.dotPath === action.dotPath)
+  const idx = charts.findIndex(chart => chart.topic === action.topic && chart.dotPath === action.dotPath)
   const item = charts.get(idx)
   const previousItem = charts.get(idx - 1)
 
@@ -95,7 +95,7 @@ function moveUp(state: ChartsState, action: MoveUp) {
 
 function updateChart(state: ChartsState, action: UpdateChart) {
   const charts = state.get('charts')
-  const chartIdx = charts.findIndex((chart) => chart.topic === action.topic && chart.dotPath === action.dotPath)
+  const chartIdx = charts.findIndex(chart => chart.topic === action.topic && chart.dotPath === action.dotPath)
   const chart = charts.get(chartIdx)
 
   return state.set('charts', chart ? charts.set(chartIdx, { ...chart, ...action.parameters }) : charts)
@@ -103,9 +103,7 @@ function updateChart(state: ChartsState, action: UpdateChart) {
 
 function removeChart(state: ChartsState, action: RemoveChart) {
   const charts = state.get('charts')
-  const newCharts = charts.filter(
-    (chart) => chart.topic !== action.chart.topic || chart.dotPath !== action.chart.dotPath
-  )
+  const newCharts = charts.filter(chart => chart.topic !== action.chart.topic || chart.dotPath !== action.chart.dotPath)
   return state.set('charts', newCharts)
 }
 
diff --git a/app/src/reducers/ConnectionManager.ts b/app/src/reducers/ConnectionManager.ts
index d855f21..f67c447 100644
--- a/app/src/reducers/ConnectionManager.ts
+++ b/app/src/reducers/ConnectionManager.ts
@@ -160,7 +160,7 @@ function addSubscription(state: ConnectionManagerState, action: AddSubscription)
 
 function deleteSubscription(state: ConnectionManagerState, action: AddSubscription): ConnectionManagerState {
   const connection = state.connections[action.connectionId]
-  const newSubscriptions = connection.subscriptions.filter((s) => s !== action.subscription)
+  const newSubscriptions = connection.subscriptions.filter(s => s !== action.subscription)
 
   return {
     ...state,
diff --git a/app/src/reducers/Global.ts b/app/src/reducers/Global.ts
index 82e891c..079b07b 100644
--- a/app/src/reducers/Global.ts
+++ b/app/src/reducers/Global.ts
@@ -90,7 +90,7 @@ export const globalState: Reducer<Record<GlobalStateInterface>, GlobalAction> =
       }
       return state.set(
         'confirmationRequests',
-        state.get('confirmationRequests').filter((a) => a !== action.confirmationRequest)
+        state.get('confirmationRequests').filter(a => a !== action.confirmationRequest)
       )
 
     default:
diff --git a/app/src/sortedNodes.tsx b/app/src/sortedNodes.tsx
index 7f9e852..e6cf151 100644
--- a/app/src/sortedNodes.tsx
+++ b/app/src/sortedNodes.tsx
@@ -9,7 +9,7 @@ export function sortedNodes(settings: SettingsState, treeNode: q.TreeNode<any>):
   if (topicOrder === TopicOrder.abc) {
     edges.sort((a, b) => a.name.localeCompare(b.name))
   }
-  const nodes = edges.map((edge) => edge.target)
+  const nodes = edges.map(edge => edge.target)
   if (topicOrder === TopicOrder.messages) {
     nodes.sort((a, b) => b.leafMessageCount() - a.leafMessageCount())
   }
diff --git a/backend/src/ConfigStorage.ts b/backend/src/ConfigStorage.ts
index 8543295..5e2e2ac 100644
--- a/backend/src/ConfigStorage.ts
+++ b/backend/src/ConfigStorage.ts
@@ -32,7 +32,7 @@ export default class ConfigStorage {
   }
 
   public async init() {
-    backendEvents.subscribe(storageStoreEvent, async (event) => {
+    backendEvents.subscribe(storageStoreEvent, async event => {
       const ack = makeStorageAcknowledgementEvent(event.transactionId)
       try {
         const db = await this.getDb()
@@ -48,7 +48,7 @@ export default class ConfigStorage {
       }
     })
 
-    backendEvents.subscribe(storageLoadEvent, async (event) => {
+    backendEvents.subscribe(storageLoadEvent, async event => {
       const responseEvent = makeStorageResponseEvent(event.transactionId)
       try {
         const db = await this.getDb()
@@ -68,7 +68,7 @@ export default class ConfigStorage {
       }
     })
 
-    backendEvents.subscribe(storageClearEvent, async (event) => {
+    backendEvents.subscribe(storageClearEvent, async event => {
       try {
         const db = await this.getDb()
         const keys = await db.keys().value()
diff --git a/backend/src/DataSource/MqttSource.ts b/backend/src/DataSource/MqttSource.ts
index 081625a..a7a5ea7 100644
--- a/backend/src/DataSource/MqttSource.ts
+++ b/backend/src/DataSource/MqttSource.ts
@@ -73,7 +73,7 @@ export class MqttSource implements DataSource<MqttOptions> {
 
     client.on('connect', () => {
       this.stateMachine.setConnected(true)
-      options.subscriptions.forEach((subscription) => {
+      options.subscriptions.forEach(subscription => {
         client.subscribe(subscription, (err: Error) => {
           if (err) {
             this.stateMachine.setError(err)
diff --git a/backend/src/JsonAstParser.ts b/backend/src/JsonAstParser.ts
index dc69157..bda553c 100644
--- a/backend/src/JsonAstParser.ts
+++ b/backend/src/JsonAstParser.ts
@@ -70,7 +70,7 @@ function jsonToPropertyPaths(ast: JsonAst, previousPath: Array<string> = []): Ar
   } else if (ast.type === 'Array') {
     children = ast.children.map((value, idx) => jsonToPropertyPaths(value, previousPath.slice().concat([String(idx)])))
   } else if (ast.type === 'Object') {
-    children = ast.children.map((property) => {
+    children = ast.children.map(property => {
       const path = property.key.value.replace('.', '\\.')
 
       return jsonToPropertyPaths(property.value, previousPath.slice().concat([path]))
diff --git a/backend/src/Model/Tree.ts b/backend/src/Model/Tree.ts
index 89d830c..15e6bb0 100644
--- a/backend/src/Model/Tree.ts
+++ b/backend/src/Model/Tree.ts
@@ -74,7 +74,7 @@ export class Tree<ViewModel extends Destroyable> extends TreeNode<ViewModel> {
   }
 
   public applyUnmergedChanges() {
-    this.unmergedMessages.popAll().forEach((bufferedItem) => {
+    this.unmergedMessages.popAll().forEach(bufferedItem => {
       const edges = bufferedItem.message.topic.split('/')
       const node = TreeNodeFactory.fromEdgesAndValue<ViewModel>(
         edges,
diff --git a/backend/src/Model/TreeNode.ts b/backend/src/Model/TreeNode.ts
index 792b216..7d8b6fe 100644
--- a/backend/src/Model/TreeNode.ts
+++ b/backend/src/Model/TreeNode.ts
@@ -156,8 +156,8 @@ export class TreeNode<ViewModel extends Destroyable> {
   public path(): string {
     if (!this.cachedPath) {
       return this.branch()
-        .map((node) => node.sourceEdge && node.sourceEdge.name)
-        .filter((name) => name !== undefined)
+        .map(node => node.sourceEdge && node.sourceEdge.name)
+        .filter(name => name !== undefined)
         .join('/')
     }
 
@@ -214,7 +214,7 @@ export class TreeNode<ViewModel extends Destroyable> {
   public leafMessageCount(): number {
     if (this.cachedLeafMessageCount === undefined) {
       this.cachedLeafMessageCount =
-        this.edgeArray.map((edge) => edge.target.leafMessageCount()).reduce((a, b) => a + b, 0) + this.messages
+        this.edgeArray.map(edge => edge.target.leafMessageCount()).reduce((a, b) => a + b, 0) + this.messages
     }
 
     return this.cachedLeafMessageCount as number
@@ -223,7 +223,7 @@ export class TreeNode<ViewModel extends Destroyable> {
   public childTopicCount(): number {
     if (this.cachedChildTopicCount === undefined) {
       this.cachedChildTopicCount = this.edgeArray
-        .map((e) => e.target.childTopicCount())
+        .map(e => e.target.childTopicCount())
         .reduce((a, b) => a + b, this.hasMessage() ? 1 : 0)
     }
 
@@ -239,7 +239,7 @@ export class TreeNode<ViewModel extends Destroyable> {
       const initialValue = this.message && this.message.value ? [this] : []
 
       this.cachedChildTopics = this.edgeArray
-        .map((e) => e.target.childTopics())
+        .map(e => e.target.childTopics())
         .reduce((a, b) => a.concat(b), initialValue)
     }
 
diff --git a/backend/src/Model/spec/EventDispatcher.spec.ts b/backend/src/Model/spec/EventDispatcher.spec.ts
index 743ba02..214902c 100644
--- a/backend/src/Model/spec/EventDispatcher.spec.ts
+++ b/backend/src/Model/spec/EventDispatcher.spec.ts
@@ -8,8 +8,8 @@ describe('EventDispatcher', async () => {
     this.timeout(300)
 
     setTimeout(() => dispatcher.dispatch('hello'), 5)
-    const response = await new Promise((resolve) => {
-      dispatcher.subscribe((msg) => {
+    const response = await new Promise(resolve => {
+      dispatcher.subscribe(msg => {
         resolve(msg)
       })
     })
diff --git a/backend/src/index.ts b/backend/src/index.ts
index e8c7ebd..48a0b2c 100644
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -27,7 +27,7 @@ export class ConnectionManager {
     this.connections[connectionId] = connection
 
     const connectionStateEvent = makeConnectionStateEvent(connectionId)
-    connection.stateMachine.onUpdate.subscribe((state) => {
+    connection.stateMachine.onUpdate.subscribe(state => {
       backendEvents.emit(connectionStateEvent, state)
     })
 
@@ -72,6 +72,6 @@ export class ConnectionManager {
   }
 
   public closeAllConnections() {
-    Object.keys(this.connections).forEach((connectionId) => this.removeConnection(connectionId))
+    Object.keys(this.connections).forEach(connectionId => this.removeConnection(connectionId))
   }
 }
diff --git a/events/EventDispatcher.ts b/events/EventDispatcher.ts
index b150607..a3152b0 100644
--- a/events/EventDispatcher.ts
+++ b/events/EventDispatcher.ts
@@ -26,13 +26,13 @@ export class EventDispatcher<Message> {
   }
 
   public unsubscribe(callback: (msg: Message) => void) {
-    const item = this.callbacks.find((store) => store.callback === callback)
+    const item = this.callbacks.find(store => store.callback === callback)
     if (!item) {
       return
     }
 
     this.emitter.removeListener('event', item.wrappedCallback)
-    this.callbacks = this.callbacks.filter((a) => a !== item)
+    this.callbacks = this.callbacks.filter(a => a !== item)
   }
 
   public removeAllListeners() {
diff --git a/events/IpcRendererEventBus.ts b/events/IpcRendererEventBus.ts
index 9108eeb..2d34293 100644
--- a/events/IpcRendererEventBus.ts
+++ b/events/IpcRendererEventBus.ts
@@ -22,12 +22,12 @@ export class IpcRendererEventBus implements EventBusInterface {
     this.ipc.removeAllListeners(event.topic)
   }
   public unsubscribe<MessageType>(event: Event<MessageType>, callback: any) {
-    const item = this.callbacks.find((store) => store.callback === callback)
+    const item = this.callbacks.find(store => store.callback === callback)
     if (!item) {
       return
     }
     this.ipc.removeListener(event.topic, item.wrappedCallback)
-    this.callbacks = this.callbacks.filter((a) => a !== item)
+    this.callbacks = this.callbacks.filter(a => a !== item)
   }
   public emit<MessageType>(event: Event<MessageType>, msg: MessageType) {
     this.ipc.send(event.topic, msg)
diff --git a/package.json b/package.json
index b58d602..87e38ea 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "source-map-support": "^0.5.9",
     "spectron": "10",
     "ts-node": "^8.2.0",
-    "tslint": "^5.18.0",
+    "tslint": "6",
     "tslint-config-airbnb": "^5.11.1",
     "tslint-react": "^4.0.0",
     "tslint-react-recommended": "^1.0.15",
diff --git a/prettier.config.js b/prettier.config.js
index 0b7ab7d..246d6a6 100644
--- a/prettier.config.js
+++ b/prettier.config.js
@@ -4,4 +4,5 @@ module.exports = {
   semi: false,
   singleQuote: true,
   printWidth: 120,
+  arrowParens: 'avoid',
 };
diff --git a/scripts/afterPack.ts b/scripts/afterPack.ts
index 1ab9240..82d0741 100644
--- a/scripts/afterPack.ts
+++ b/scripts/afterPack.ts
@@ -15,7 +15,7 @@ interface Context {
 
 export default async function (context: Context) {
   console.log(context)
-  const isLinux = context.targets.find((target) => target.name === 'appImage')
+  const isLinux = context.targets.find(target => target.name === 'appImage')
   if (!isLinux) {
     return
   }
diff --git a/scripts/cutScenes.ts b/scripts/cutScenes.ts
index 2f336ee..3ef7fdb 100755
--- a/scripts/cutScenes.ts
+++ b/scripts/cutScenes.ts
@@ -40,8 +40,8 @@ class TransitionBuilder {
   public buildOptions(outputFile: string) {
     return {
       output: outputFile,
-      videos: this.scenes.map((s) => `${s}.mp4`),
-      transitions: this.transitions.map((name) => ({
+      videos: this.scenes.map(s => `${s}.mp4`),
+      transitions: this.transitions.map(name => ({
         name: name !== 'none' ? name : 'fade',
         duration: name !== 'none' ? 1000 : 10,
       })),
diff --git a/scripts/util.ts b/scripts/util.ts
index 83ce13b..17cfc4f 100644
--- a/scripts/util.ts
+++ b/scripts/util.ts
@@ -23,7 +23,7 @@ function redirectOutputFor(child: ChildProcess) {
 }
 
 async function waitFor(child: ChildProcess) {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     child.once('close', () => resolve())
   })
 }
diff --git a/src/autoUpdater.ts b/src/autoUpdater.ts
index fcda3d3..22f0c9c 100644
--- a/src/autoUpdater.ts
+++ b/src/autoUpdater.ts
@@ -16,7 +16,7 @@ export function handleAutoUpdate() {
     console.log('There is an update available')
   })
 
-  autoUpdater.on('error', (error) => {
+  autoUpdater.on('error', error => {
     console.error('could not update due to error', error)
   })
 
diff --git a/src/development.ts b/src/development.ts
index a02b65e..acc9438 100644
--- a/src/development.ts
+++ b/src/development.ts
@@ -11,7 +11,7 @@ export async function waitForDevServer() {
       response = await axios.get('http://localhost:8080')
     } catch {
       console.log('Waiting for dev server')
-      await new Promise((resolve) => setTimeout(resolve, 1000))
+      await new Promise(resolve => setTimeout(resolve, 1000))
     }
   }
 }
@@ -24,9 +24,9 @@ export function loadDevTools() {
 }
 
 export function isDev() {
-  return Boolean(process.argv.find((arg) => arg === '--development'))
+  return Boolean(process.argv.find(arg => arg === '--development'))
 }
 
 export function runningUiTestOnCi() {
-  return Boolean(process.argv.find((arg) => arg === '--runningUiTestOnCi'))
+  return Boolean(process.argv.find(arg => arg === '--runningUiTestOnCi'))
 }
diff --git a/src/spec/mock-mqtt.ts b/src/spec/mock-mqtt.ts
index e159cc0..f9f2af8 100644
--- a/src/spec/mock-mqtt.ts
+++ b/src/spec/mock-mqtt.ts
@@ -2,7 +2,7 @@ import * as mqtt from 'mqtt'
 
 let mqttClient: mqtt.MqttClient
 function startServer(): Promise<mqtt.MqttClient> {
-  return new Promise(async (resolve) => {
+  return new Promise(async resolve => {
     mqttClient = await connectMqtt()
     generateData(mqttClient)
     resolve(mqttClient)
@@ -10,7 +10,7 @@ function startServer(): Promise<mqtt.MqttClient> {
 }
 
 function connectMqtt(): Promise<mqtt.MqttClient> {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     const client = mqtt.connect('mqtt://127.0.0.1:1883', {
       username: '',
       password: '',
diff --git a/src/spec/util/expandTopic.ts b/src/spec/util/expandTopic.ts
index 59d22cc..1d8fa5e 100644
--- a/src/spec/util/expandTopic.ts
+++ b/src/spec/util/expandTopic.ts
@@ -24,6 +24,6 @@ async function topicMatches(topics: Array<string>, browser: Browser) {
 }
 
 function topicSelector(topics: Array<string>) {
-  const suffix = topics.map((topic) => `*[contains(text(), "${topic}")]`).join('/../..//')
+  const suffix = topics.map(topic => `*[contains(text(), "${topic}")]`).join('/../..//')
   return `//${suffix}`
 }
diff --git a/src/spec/util/index.ts b/src/spec/util/index.ts
index b01bf5b..18a6893 100644
--- a/src/spec/util/index.ts
+++ b/src/spec/util/index.ts
@@ -9,7 +9,7 @@ export function setFast() {
 }
 
 export function sleep(ms: number, required = false) {
-  return new Promise((resolve) => {
+  return new Promise(resolve => {
     if (required) {
       setTimeout(resolve, ms)
     } else {
diff --git a/yarn.lock b/yarn.lock
index 49d76c7..ed9aad1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3418,7 +3418,7 @@ mkdirp@0.5.3:
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1:
+mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -5002,7 +5002,7 @@ tslib@1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
   integrity sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==
 
-tslib@^1.7.1, tslib@^1.8.0, tslib@^1.8.1:
+tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.1:
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35"
   integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==
@@ -5058,10 +5058,10 @@ tslint-strict-null-checks@^1.0.1:
   resolved "https://registry.yarnpkg.com/tslint-strict-null-checks/-/tslint-strict-null-checks-1.0.1.tgz#29ad44ed353185f5d7af66a76e29a1bee74d944b"
   integrity sha512-W7SzlPqOv7E/UnqrqcbUFXeE5M/YU41GpkHY5nkAyhBW12UJ3Xhh9rLAizw57xFLng4Y400h06udmgDe2cNBCg==
 
-tslint@^5.18.0:
-  version "5.20.1"
-  resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d"
-  integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==
+tslint@6:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.1.tgz#ac03fbd17f85bfefaae348b353b25a88efe10cde"
+  integrity sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
     builtin-modules "^1.1.1"
@@ -5071,10 +5071,10 @@ tslint@^5.18.0:
     glob "^7.1.1"
     js-yaml "^3.13.1"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
+    mkdirp "^0.5.3"
     resolve "^1.3.2"
     semver "^5.3.0"
-    tslib "^1.8.0"
+    tslib "^1.10.0"
     tsutils "^2.29.0"
 
 "tsutils@^2.27.2 <2.29.0":