diff --git a/src/components/popover/tab/keypress/keypress-tab.component.ts b/src/components/popover/tab/keypress/keypress-tab.component.ts
index 271485d8..ccfac0b2 100644
--- a/src/components/popover/tab/keypress/keypress-tab.component.ts
+++ b/src/components/popover/tab/keypress/keypress-tab.component.ts
@@ -1,10 +1,10 @@
-import {Component, Input, OnInit} from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
-import {Select2OptionData} from 'ng2-select2/ng2-select2';
+import { Select2OptionData } from 'ng2-select2/ng2-select2';
 
-import {KeyAction, KeystrokeAction} from '../../../../config-serializer/config-items/key-action';
+import { KeyAction, KeystrokeAction } from '../../../../config-serializer/config-items/key-action';
 
-import {Tab} from '../tab';
+import { Tab } from '../tab';
 
 @Component({
     selector: 'keypress-tab',
diff --git a/src/components/popover/tab/layer/layer-tab.component.ts b/src/components/popover/tab/layer/layer-tab.component.ts
index 872f315b..1b68585f 100644
--- a/src/components/popover/tab/layer/layer-tab.component.ts
+++ b/src/components/popover/tab/layer/layer-tab.component.ts
@@ -1,10 +1,10 @@
-import {Component, Input,  OnInit, ViewChild} from '@angular/core';
+import { Component, Input,  OnInit, ViewChild } from '@angular/core';
 
-import {KeyAction, LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/key-action';
+import { KeyAction, LayerName, SwitchLayerAction } from '../../../../config-serializer/config-items/key-action';
 
-import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
+import { Select2Component, Select2OptionData } from 'ng2-select2/ng2-select2';
 
-import {Tab} from '../tab';
+import { Tab } from '../tab';
 
 @Component({
     selector: 'layer-tab',
diff --git a/src/components/popover/tab/macro/macro-tab.component.ts b/src/components/popover/tab/macro/macro-tab.component.ts
index 12d67e94..91701b3a 100644
--- a/src/components/popover/tab/macro/macro-tab.component.ts
+++ b/src/components/popover/tab/macro/macro-tab.component.ts
@@ -1,13 +1,13 @@
-import {Component, Input, OnInit} from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
-import {Select2OptionData} from 'ng2-select2/ng2-select2';
+import { Select2OptionData } from 'ng2-select2/ng2-select2';
 
-import {KeyAction, PlayMacroAction} from '../../../../config-serializer/config-items/key-action';
-import {Macro} from '../../../../config-serializer/config-items/Macro';
+import { KeyAction, PlayMacroAction } from '../../../../config-serializer/config-items/key-action';
+import { Macro } from '../../../../config-serializer/config-items/Macro';
 
-import {Tab} from '../tab';
+import { Tab } from '../tab';
 
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
+import { UhkConfigurationService } from '../../../../services/uhk-configuration.service';
 
 @Component({
     selector: 'macro-tab',
diff --git a/src/components/popover/tab/mouse/mouse-tab.component.ts b/src/components/popover/tab/mouse/mouse-tab.component.ts
index 4ca8f3f0..f247abc6 100644
--- a/src/components/popover/tab/mouse/mouse-tab.component.ts
+++ b/src/components/popover/tab/mouse/mouse-tab.component.ts
@@ -1,7 +1,7 @@
-import {Component, Input, OnInit} from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
-import {KeyAction, MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/key-action';
-import {Tab} from '../tab';
+import { KeyAction, MouseAction, MouseActionParam } from '../../../../config-serializer/config-items/key-action';
+import { Tab } from '../tab';
 
 @Component({
     selector: 'mouse-tab',
diff --git a/src/components/popover/tab/none/none-tab.component.ts b/src/components/popover/tab/none/none-tab.component.ts
index 469b3918..1b53af74 100644
--- a/src/components/popover/tab/none/none-tab.component.ts
+++ b/src/components/popover/tab/none/none-tab.component.ts
@@ -1,7 +1,7 @@
-import {Component, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 
-import {NoneAction} from '../../../../config-serializer/config-items/key-action';
-import {Tab} from '../tab';
+import { NoneAction } from '../../../../config-serializer/config-items/key-action';
+import { Tab } from '../tab';
 
 @Component({
     selector: 'none-tab',
diff --git a/src/components/popover/tab/tab.ts b/src/components/popover/tab/tab.ts
index 04975b8a..c73470d2 100644
--- a/src/components/popover/tab/tab.ts
+++ b/src/components/popover/tab/tab.ts
@@ -1,4 +1,4 @@
-import {KeyAction} from '../../../config-serializer/config-items/key-action';
+import { KeyAction } from '../../../config-serializer/config-items/key-action';
 
 export interface Tab {
     keyActionValid(): boolean;
diff --git a/src/components/svg/keyboard/svg-keyboard.component.ts b/src/components/svg/keyboard/svg-keyboard.component.ts
index 5c261468..e7289658 100644
--- a/src/components/svg/keyboard/svg-keyboard.component.ts
+++ b/src/components/svg/keyboard/svg-keyboard.component.ts
@@ -1,9 +1,9 @@
-import { Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 
-import {Module} from '../../../config-serializer/config-items/Module';
-import {SvgModule} from '../module';
+import { Module } from '../../../config-serializer/config-items/Module';
+import { SvgModule } from '../module';
 
-import {DataProviderService} from '../../../services/data-provider.service';
+import { DataProviderService } from '../../../services/data-provider.service';
 
 @Component({
     selector: 'svg-keyboard',
diff --git a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
index 486e3c63..74ccd9f7 100644
--- a/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -8,11 +8,11 @@ import {
     SwitchKeymapAction,
     SwitchLayerAction
 } from '../../../../config-serializer/config-items/key-action';
-import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers';
-import {UhkConfiguration} from '../../../../config-serializer/config-items/UhkConfiguration';
+import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
+import { UhkConfiguration } from '../../../../config-serializer/config-items/UhkConfiguration';
 
-import {MapperService} from '../../../../services/mapper.service';
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
+import { MapperService } from '../../../../services/mapper.service';
+import { UhkConfigurationService } from '../../../../services/uhk-configuration.service';
 
 enum LabelTypes {
     KeystrokeKey,
diff --git a/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts
index 3d51bba4..89f4c8df 100644
--- a/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts
+++ b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import {MapperService} from '../../../../services/mapper.service';
+import { MapperService } from '../../../../services/mapper.service';
 
 @Component({
     selector: 'g[svg-switch-keymap-key]',
diff --git a/src/components/svg/wrap/svg-keyboard-wrap.component.ts b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
index 0f60b58e..97341381 100644
--- a/src/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/src/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -1,6 +1,13 @@
 import {
-    Component, Input, OnChanges, SimpleChanges, animate,
-    state, style, transition, trigger
+    Component,
+    Input,
+    OnChanges,
+    SimpleChanges,
+    animate,
+    state,
+    style,
+    transition,
+    trigger
 } from '@angular/core';
 
 import { Store } from '@ngrx/store';
diff --git a/src/config-serializer/ClassArray.ts b/src/config-serializer/ClassArray.ts
index 77cb48d7..354bff48 100644
--- a/src/config-serializer/ClassArray.ts
+++ b/src/config-serializer/ClassArray.ts
@@ -1,5 +1,5 @@
-import {Serializable} from './Serializable';
-import {UhkBuffer} from './UhkBuffer';
+import { Serializable } from './Serializable';
+import { UhkBuffer } from './UhkBuffer';
 
 export abstract class ClassArray<T extends Serializable<T>> extends Serializable<ClassArray<T>> {
 
diff --git a/src/config-serializer/Serializable.ts b/src/config-serializer/Serializable.ts
index 605d87d8..5fba0b03 100644
--- a/src/config-serializer/Serializable.ts
+++ b/src/config-serializer/Serializable.ts
@@ -1,6 +1,6 @@
 /// <references path="Function.d.ts">
 
-import {UhkBuffer} from './UhkBuffer';
+import { UhkBuffer } from './UhkBuffer';
 
 export abstract class Serializable<T> {
 
diff --git a/src/config-serializer/config-items/Keymaps.ts b/src/config-serializer/config-items/Keymaps.ts
index 96a81bdc..4fddea44 100644
--- a/src/config-serializer/config-items/Keymaps.ts
+++ b/src/config-serializer/config-items/Keymaps.ts
@@ -1,6 +1,6 @@
-import {ClassArray} from '../ClassArray';
-import {UhkBuffer} from '../UhkBuffer';
-import {Keymap} from './Keymap';
+import { ClassArray } from '../ClassArray';
+import { UhkBuffer } from '../UhkBuffer';
+import { Keymap } from './Keymap';
 
 export class Keymaps extends ClassArray<Keymap> {
 
diff --git a/src/config-serializer/config-items/Macro.ts b/src/config-serializer/config-items/Macro.ts
index 935a53f7..9ee71d0e 100644
--- a/src/config-serializer/config-items/Macro.ts
+++ b/src/config-serializer/config-items/Macro.ts
@@ -1,7 +1,7 @@
-import {assertUInt8} from '../assert';
-import {Serializable} from '../Serializable';
-import {UhkBuffer} from '../UhkBuffer';
-import {MacroActions} from './macro-action';
+import { assertUInt8 } from '../assert';
+import { Serializable } from '../Serializable';
+import { UhkBuffer } from '../UhkBuffer';
+import { MacroActions } from './macro-action';
 
 export class Macro extends Serializable<Macro> {
 
diff --git a/src/config-serializer/config-items/Macros.ts b/src/config-serializer/config-items/Macros.ts
index 9219f648..e4baf036 100644
--- a/src/config-serializer/config-items/Macros.ts
+++ b/src/config-serializer/config-items/Macros.ts
@@ -1,6 +1,6 @@
-import {ClassArray} from '../ClassArray';
-import {UhkBuffer} from '../UhkBuffer';
-import {Macro} from './Macro';
+import { ClassArray } from '../ClassArray';
+import { UhkBuffer } from '../UhkBuffer';
+import { Macro } from './Macro';
 
 export class Macros extends ClassArray<Macro> {
 
diff --git a/src/config-serializer/config-items/ModuleConfiguration.ts b/src/config-serializer/config-items/ModuleConfiguration.ts
index 1b2b144e..5b8a033b 100644
--- a/src/config-serializer/config-items/ModuleConfiguration.ts
+++ b/src/config-serializer/config-items/ModuleConfiguration.ts
@@ -1,6 +1,6 @@
-import {assertUInt8} from '../assert';
-import {Serializable} from '../Serializable';
-import {UhkBuffer} from '../UhkBuffer';
+import { assertUInt8 } from '../assert';
+import { Serializable } from '../Serializable';
+import { UhkBuffer } from '../UhkBuffer';
 
 export class ModuleConfiguration extends Serializable<ModuleConfiguration> {
 
diff --git a/src/config-serializer/config-items/ModuleConfigurations.ts b/src/config-serializer/config-items/ModuleConfigurations.ts
index 56352bab..8d49f1a6 100644
--- a/src/config-serializer/config-items/ModuleConfigurations.ts
+++ b/src/config-serializer/config-items/ModuleConfigurations.ts
@@ -1,6 +1,6 @@
-import {ClassArray} from '../ClassArray';
-import {UhkBuffer} from '../UhkBuffer';
-import {ModuleConfiguration} from './ModuleConfiguration';
+import { ClassArray } from '../ClassArray';
+import { UhkBuffer } from '../UhkBuffer';
+import { ModuleConfiguration } from './ModuleConfiguration';
 
 export class ModuleConfigurations extends ClassArray<ModuleConfiguration> {
 
diff --git a/src/config-serializer/config-items/key-action/KeyAction.ts b/src/config-serializer/config-items/key-action/KeyAction.ts
index c1e8db4b..3e15505f 100644
--- a/src/config-serializer/config-items/key-action/KeyAction.ts
+++ b/src/config-serializer/config-items/key-action/KeyAction.ts
@@ -1,7 +1,7 @@
 /// <reference path="../../Function.d.ts" />
 
-import {Serializable} from '../../Serializable';
-import {UhkBuffer} from '../../UhkBuffer';
+import { Serializable } from '../../Serializable';
+import { UhkBuffer } from '../../UhkBuffer';
 
 export enum KeyActionId {
     NoneAction                   = 0,
diff --git a/src/config-serializer/config-items/key-action/NoneAction.ts b/src/config-serializer/config-items/key-action/NoneAction.ts
index c58776cb..25b4fb21 100644
--- a/src/config-serializer/config-items/key-action/NoneAction.ts
+++ b/src/config-serializer/config-items/key-action/NoneAction.ts
@@ -1,5 +1,5 @@
-import {UhkBuffer} from '../../UhkBuffer';
-import {KeyAction, KeyActionId, keyActionType} from './KeyAction';
+import { UhkBuffer } from '../../UhkBuffer';
+import { KeyAction, KeyActionId, keyActionType } from './KeyAction';
 
 export class NoneAction extends KeyAction {
 
diff --git a/src/config-serializer/config-items/macro-action/DelayMacroAction.ts b/src/config-serializer/config-items/macro-action/DelayMacroAction.ts
index 24a537a3..2b59a788 100644
--- a/src/config-serializer/config-items/macro-action/DelayMacroAction.ts
+++ b/src/config-serializer/config-items/macro-action/DelayMacroAction.ts
@@ -1,6 +1,6 @@
-import {assertUInt16} from '../../assert';
-import {UhkBuffer} from '../../UhkBuffer';
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import { assertUInt16 } from '../../assert';
+import { UhkBuffer } from '../../UhkBuffer';
+import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
 
 export class DelayMacroAction extends MacroAction {
 
diff --git a/src/config-serializer/config-items/macro-action/KeyMacroAction.ts b/src/config-serializer/config-items/macro-action/KeyMacroAction.ts
index 54895567..5c1de7d1 100644
--- a/src/config-serializer/config-items/macro-action/KeyMacroAction.ts
+++ b/src/config-serializer/config-items/macro-action/KeyMacroAction.ts
@@ -1,5 +1,5 @@
 import { assertEnum, assertUInt8 } from '../../assert';
-import { UhkBuffer} from '../../UhkBuffer';
+import { UhkBuffer } from '../../UhkBuffer';
 import { KeyModifiers } from '../KeyModifiers';
 import { MacroAction, MacroActionId, MacroSubAction, macroActionType } from './MacroAction';
 
diff --git a/src/config-serializer/config-items/macro-action/MacroAction.ts b/src/config-serializer/config-items/macro-action/MacroAction.ts
index 73c85ba5..f6c7e4b7 100644
--- a/src/config-serializer/config-items/macro-action/MacroAction.ts
+++ b/src/config-serializer/config-items/macro-action/MacroAction.ts
@@ -1,5 +1,5 @@
-import {Serializable} from '../../Serializable';
-import {UhkBuffer} from '../../UhkBuffer';
+import { Serializable } from '../../Serializable';
+import { UhkBuffer } from '../../UhkBuffer';
 
 export enum MacroActionId {
     KeyMacroAction                  =  0,
diff --git a/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts b/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts
index 37df73ad..d64100cd 100644
--- a/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts
+++ b/src/config-serializer/config-items/macro-action/MoveMouseMacroAction.ts
@@ -1,6 +1,6 @@
-import {assertInt16} from '../../assert';
-import {UhkBuffer} from '../../UhkBuffer';
-import {MacroAction, MacroActionId,  macroActionType} from './MacroAction';
+import { assertInt16 } from '../../assert';
+import { UhkBuffer } from '../../UhkBuffer';
+import { MacroAction, MacroActionId,  macroActionType } from './MacroAction';
 
 export class MoveMouseMacroAction extends MacroAction {
 
diff --git a/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts b/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts
index d6722ff8..e5ff7a8e 100644
--- a/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts
+++ b/src/config-serializer/config-items/macro-action/ScrollMouseMacroAction.ts
@@ -1,6 +1,6 @@
-import {assertInt16} from '../../assert';
-import {UhkBuffer} from '../../UhkBuffer';
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import { assertInt16 } from '../../assert';
+import { UhkBuffer } from '../../UhkBuffer';
+import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
 
 export class ScrollMouseMacroAction extends MacroAction {
 
diff --git a/src/config-serializer/config-items/macro-action/TextMacroAction.ts b/src/config-serializer/config-items/macro-action/TextMacroAction.ts
index 435b9353..1b3df2cf 100644
--- a/src/config-serializer/config-items/macro-action/TextMacroAction.ts
+++ b/src/config-serializer/config-items/macro-action/TextMacroAction.ts
@@ -1,5 +1,5 @@
-import {UhkBuffer} from '../../UhkBuffer';
-import {MacroAction, MacroActionId, macroActionType} from './MacroAction';
+import { UhkBuffer } from '../../UhkBuffer';
+import { MacroAction, MacroActionId, macroActionType } from './MacroAction';
 
 export class TextMacroAction extends MacroAction {
 
diff --git a/src/directives/contenteditable/contenteditable.directive.ts b/src/directives/contenteditable/contenteditable.directive.ts
index 0b766f11..46f618a6 100644
--- a/src/directives/contenteditable/contenteditable.directive.ts
+++ b/src/directives/contenteditable/contenteditable.directive.ts
@@ -1,4 +1,4 @@
-import {Directive, ElementRef, EventEmitter, Input, OnChanges, Output, Renderer, SimpleChanges } from '@angular/core';
+import { Directive, ElementRef, EventEmitter, Input, OnChanges, Output, Renderer, SimpleChanges } from '@angular/core';
 
 const KEY_ENTER = 13;
 
diff --git a/src/main-app/main-app.component.ts b/src/main-app/main-app.component.ts
index 91841d0b..9db4848f 100644
--- a/src/main-app/main-app.component.ts
+++ b/src/main-app/main-app.component.ts
@@ -1,4 +1,4 @@
-import {Component, ViewEncapsulation} from '@angular/core';
+import { Component, ViewEncapsulation } from '@angular/core';
 
 @Component({
     selector: 'main-app',
diff --git a/src/services/data-provider.service.ts b/src/services/data-provider.service.ts
index 6ce09b72..19c3110b 100644
--- a/src/services/data-provider.service.ts
+++ b/src/services/data-provider.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import {SvgModule} from '../components/svg/module/svg-module.model';
+import { SvgModule } from '../components/svg/module/svg-module.model';
 
 @Injectable()
 export class DataProviderService {
diff --git a/src/services/uhk-configuration.service.ts b/src/services/uhk-configuration.service.ts
index 0cf5af97..ae9abd07 100644
--- a/src/services/uhk-configuration.service.ts
+++ b/src/services/uhk-configuration.service.ts
@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 
-import {UhkConfiguration} from '../config-serializer/config-items/UhkConfiguration';
+import { UhkConfiguration } from '../config-serializer/config-items/UhkConfiguration';
 
-import {DataProviderService} from './data-provider.service';
+import { DataProviderService } from './data-provider.service';
 
 @Injectable()
 export class UhkConfigurationService {
diff --git a/usb/UhkConnection.js b/usb/UhkConnection.js
index 6995e646..9e4d8c73 100644
--- a/usb/UhkConnection.js
+++ b/usb/UhkConnection.js
@@ -1,6 +1,6 @@
 var usb = require('usb');
 var R = require('ramda');
-var s = require('underscore.string')
+var s = require('underscore.string');
 
 var UhkConnection = function(selectedLogLevel) {
     'use strict';