diff --git a/types/angular-clipboard/angular-clipboard-tests.ts b/types/angular-clipboard/angular-clipboard-tests.ts
index 00c5074ec5..6df5af0c5e 100644
--- a/types/angular-clipboard/angular-clipboard-tests.ts
+++ b/types/angular-clipboard/angular-clipboard-tests.ts
@@ -1,5 +1,5 @@
 import * as angular from "angular";
-import {ClipboardService} from "angular-clipboard";
+import { ClipboardService } from "angular-clipboard";
 
 interface TestScope extends ng.IScope {
     [index: string]: any;
diff --git a/types/angular/angular-component-router.d.ts b/types/angular/angular-component-router.d.ts
index da3afc7a71..b8c939f7c8 100644
--- a/types/angular/angular-component-router.d.ts
+++ b/types/angular/angular-component-router.d.ts
@@ -15,7 +15,7 @@ declare namespace angular {
      * ### Example
      *
      * ```
-     * import {Component} from 'angular2/core';
+     * import { Component } from 'angular2/core';
      * import {bootstrap} from 'angular2/platform/browser';
      * import {Router, ROUTER_DIRECTIVES, ROUTER_PROVIDERS, RouteConfig} from 'angular2/router';
      *
diff --git a/types/argparse/argparse-tests.ts b/types/argparse/argparse-tests.ts
index cec1ece95b..f5b9e76f81 100644
--- a/types/argparse/argparse-tests.ts
+++ b/types/argparse/argparse-tests.ts
@@ -1,7 +1,7 @@
 
 // near copy of each of the tests from https://github.com/nodeca/argparse/tree/master/examples
 
-import {ArgumentParser, RawDescriptionHelpFormatter} from 'argparse';
+import { ArgumentParser, RawDescriptionHelpFormatter } from 'argparse';
 var args: any;
 
 var simpleExample = new ArgumentParser({
diff --git a/types/assert-plus/index.d.ts b/types/assert-plus/index.d.ts
index d79172bc49..6c1f369729 100644
--- a/types/assert-plus/index.d.ts
+++ b/types/assert-plus/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import {Stream} from 'stream';
+import { Stream } from 'stream';
 
 export function array(arr: any[], message ?: string): void;
 
diff --git a/types/async.nexttick/async.nexttick-tests.ts b/types/async.nexttick/async.nexttick-tests.ts
index 90f6ae7f15..876a8e0f88 100644
--- a/types/async.nexttick/async.nexttick-tests.ts
+++ b/types/async.nexttick/async.nexttick-tests.ts
@@ -1,4 +1,4 @@
-import {nextTick} from 'async.nexttick';
+import { nextTick } from 'async.nexttick';
 
 function calledOnNextTick(a: string): number {
     return parseInt(a, 10);
diff --git a/types/auto-sni/index.d.ts b/types/auto-sni/index.d.ts
index bc252831ca..19272446a6 100644
--- a/types/auto-sni/index.d.ts
+++ b/types/auto-sni/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import {Server} from "https";
+import { Server } from "https";
 
 declare namespace createServer {
 	interface Options {
diff --git a/types/babel-core/index.d.ts b/types/babel-core/index.d.ts
index 029d5b5433..653ab1228d 100644
--- a/types/babel-core/index.d.ts
+++ b/types/babel-core/index.d.ts
@@ -14,7 +14,7 @@ export {t as types};
 type Node = t.Node;
 export import template = require('babel-template');
 export var version: string;
-import traverse, {Visitor} from "babel-traverse";
+import traverse, {Visitor } from "babel-traverse";
 export {traverse, Visitor};
 
 
diff --git a/types/babel-generator/babel-generator-tests.ts b/types/babel-generator/babel-generator-tests.ts
index 92c65b7f54..1aeec38831 100644
--- a/types/babel-generator/babel-generator-tests.ts
+++ b/types/babel-generator/babel-generator-tests.ts
@@ -1,5 +1,5 @@
 // Example from https://github.com/babel/babel/tree/master/packages/babel-generator
-import {parse} from 'babylon';
+import { parse } from 'babylon';
 import generate from 'babel-generator';
 
 const code = 'class Example {}';
diff --git a/types/babel-template/index.d.ts b/types/babel-template/index.d.ts
index fd0852127a..71fd5318f7 100644
--- a/types/babel-template/index.d.ts
+++ b/types/babel-template/index.d.ts
@@ -9,7 +9,7 @@
 /// <reference types="babel-types" />
 
 
-import {BabylonOptions} from 'babylon';
+import { BabylonOptions } from 'babylon';
 import * as t from 'babel-types';
 type Node = t.Node;
 
diff --git a/types/babel-traverse/babel-traverse-tests.ts b/types/babel-traverse/babel-traverse-tests.ts
index 5952faefd1..92f99f28ae 100644
--- a/types/babel-traverse/babel-traverse-tests.ts
+++ b/types/babel-traverse/babel-traverse-tests.ts
@@ -2,7 +2,7 @@
 
 
 import * as babylon from "babylon";
-import traverse, {Visitor} from 'babel-traverse';
+import traverse, {Visitor } from 'babel-traverse';
 import * as t from 'babel-types';
 
 
diff --git a/types/basic-auth/basic-auth-tests.ts b/types/basic-auth/basic-auth-tests.ts
index e416afe352..9c03137b37 100644
--- a/types/basic-auth/basic-auth-tests.ts
+++ b/types/basic-auth/basic-auth-tests.ts
@@ -1,4 +1,4 @@
-import {IncomingMessage} from 'http';
+import { IncomingMessage } from 'http';
 import auth = require('basic-auth');
 
 const loginData = auth(undefined! as IncomingMessage);
diff --git a/types/bleno/tslint.json b/types/bleno/tslint.json
index 377cc837d4..3db14f85ea 100644
--- a/types/bleno/tslint.json
+++ b/types/bleno/tslint.json
@@ -1 +1 @@
-{ "extends": "../tslint.json" }
+{ "extends": "dtslint/dt.json" }
diff --git a/types/blessed/index.d.ts b/types/blessed/index.d.ts
index b08f77b3b1..abbc31d295 100644
--- a/types/blessed/index.d.ts
+++ b/types/blessed/index.d.ts
@@ -5,7 +5,7 @@
 
 ///<reference types="node"/>
 
-import {EventEmitter} from 'events';
+import { EventEmitter } from 'events';
 import * as stream from "stream";
 import * as child_process from "child_process";
 
diff --git a/types/bwip-js/index.d.ts b/types/bwip-js/index.d.ts
index 9c37fa6e44..04732ef703 100644
--- a/types/bwip-js/index.d.ts
+++ b/types/bwip-js/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import {IncomingMessage as Request, ServerResponse as Response} from 'http';
+import { IncomingMessage as Request, ServerResponse as Response } from 'http';
 
 declare namespace BwipJs {
     export function loadFont(fontName:string, sizeMulti: number, fontFile: string): void;
diff --git a/types/chokidar/index.d.ts b/types/chokidar/index.d.ts
index 09e957aa05..b60a4a5655 100644
--- a/types/chokidar/index.d.ts
+++ b/types/chokidar/index.d.ts
@@ -6,7 +6,7 @@
 /// <reference types="node" />
 
 import * as fs from 'fs';
-import {EventEmitter} from 'events';
+import { EventEmitter } from 'events';
 
 /**
  * The object's keys are all the directories (using absolute paths unless the `cwd` option was
diff --git a/types/closure-compiler/closure-compiler-tests.ts b/types/closure-compiler/closure-compiler-tests.ts
index 3dd827a0f8..44693fca43 100644
--- a/types/closure-compiler/closure-compiler-tests.ts
+++ b/types/closure-compiler/closure-compiler-tests.ts
@@ -1,4 +1,4 @@
-import {compile} from 'closure-compiler';
+import { compile } from 'closure-compiler';
 
 compile('some.source()', {'check-only': null},
         (err: Error, stdout: string, stderr: string): void => {
diff --git a/types/consul/index.d.ts b/types/consul/index.d.ts
index 4d577cd2a1..3d344ae983 100644
--- a/types/consul/index.d.ts
+++ b/types/consul/index.d.ts
@@ -7,7 +7,7 @@
 
 
 
-import {IncomingMessage as HttpIncomingMessage} from "http";
+import { IncomingMessage as HttpIncomingMessage } from "http";
 
 declare namespace Consul {
 
diff --git a/types/d3-hsv/d3-hsv-tests.ts b/types/d3-hsv/d3-hsv-tests.ts
index 72e18145e6..0d3e564360 100644
--- a/types/d3-hsv/d3-hsv-tests.ts
+++ b/types/d3-hsv/d3-hsv-tests.ts
@@ -6,8 +6,8 @@
  * are not intended as functional tests.
  */
 
-import {hsv, HSVColor} from 'd3-hsv';
-import {rgb, RGBColor} from 'd3-color';
+import { hsv, HSVColor } from 'd3-hsv';
+import { rgb, RGBColor } from 'd3-color';
 
 let c: RGBColor;
 let cHSV: HSVColor;
diff --git a/types/d3-hsv/index.d.ts b/types/d3-hsv/index.d.ts
index c10fa6ee44..6a7a2c8560 100644
--- a/types/d3-hsv/index.d.ts
+++ b/types/d3-hsv/index.d.ts
@@ -5,7 +5,7 @@
 
 // Last module patch version validated against: 0.0.3
 
-import {Color, RGBColor, ColorSpaceObject, ColorCommonInstance} from 'd3-color';
+import { Color, RGBColor, ColorSpaceObject, ColorCommonInstance } from 'd3-color';
 
 export type ColorSpaceObjectWithHSV = ColorSpaceObject | HSVColor;
 
diff --git a/types/d3-selection-multi/index.d.ts b/types/d3-selection-multi/index.d.ts
index da3c64e5e3..4dd2a47c46 100644
--- a/types/d3-selection-multi/index.d.ts
+++ b/types/d3-selection-multi/index.d.ts
@@ -5,8 +5,8 @@
 
 // Last module patch version validated against: 1.0.0
 
-import {Selection, BaseType, ArrayLike, ValueFn} from 'd3-selection';
-import {Transition} from 'd3-transition';
+import { Selection, BaseType, ArrayLike, ValueFn } from 'd3-selection';
+import { Transition } from 'd3-transition';
 
 /**
  * An object mapping attribute (or style or property) names to value accessors
diff --git a/types/d3-tip/index.d.ts b/types/d3-tip/index.d.ts
index e820e8120f..5a70a6cf4d 100644
--- a/types/d3-tip/index.d.ts
+++ b/types/d3-tip/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Gert Braspenning <https://github.com/brspnnggrt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {Primitive} from "d3";
+import { Primitive } from "d3";
 
 declare module "d3" {
     type TooltipDirection = ("n" | "s" | "e" | "w" | "nw" | "ne" | "sw" | "se");
diff --git a/types/debessmann/debessmann-tests.ts b/types/debessmann/debessmann-tests.ts
index 802257992e..4a247827fd 100644
--- a/types/debessmann/debessmann-tests.ts
+++ b/types/debessmann/debessmann-tests.ts
@@ -1,4 +1,4 @@
-import {DM, Event, EventId} from 'debessmann';
+import { DM, Event, EventId } from 'debessmann';
 
 let eventId: EventId = {seq: 0, time: new Date()};
 let e: Event = {_id: eventId, headers: {header1: 'header1Val'}};
diff --git a/types/decay/decay-tests.ts b/types/decay/decay-tests.ts
index 20f33210ac..af45c63923 100644
--- a/types/decay/decay-tests.ts
+++ b/types/decay/decay-tests.ts
@@ -1,4 +1,4 @@
-import {redditHot, hackerHot, wilsonScore} from 'decay';
+import { redditHot, hackerHot, wilsonScore } from 'decay';
 
 const upvotes = 42;
 const downvotes = 12;
diff --git a/types/decorum/decorum-tests.ts b/types/decorum/decorum-tests.ts
index 8cd03e046c..d6f2565fa5 100644
--- a/types/decorum/decorum-tests.ts
+++ b/types/decorum/decorum-tests.ts
@@ -1,4 +1,4 @@
-import {Required} from 'decorum';
+import { Required } from 'decorum';
 import {Email} from 'decorum';
 import {MinLength} from 'decorum';
 import {MaxLength} from 'decorum';
diff --git a/types/dookie/dookie-tests.ts b/types/dookie/dookie-tests.ts
index 476538b8de..e672d59de6 100644
--- a/types/dookie/dookie-tests.ts
+++ b/types/dookie/dookie-tests.ts
@@ -1,4 +1,4 @@
-import {push, pull} from 'dookie';
+import { push, pull } from 'dookie';
 
 (async () => {
     await push('mongodb://localhost:27017/test', {test: [{ok: 1}, {ok: 2}]});
diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index 4315611765..46f90a8a31 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import {Map} from "immutable";
+import { Map } from "immutable";
 
 import {
   ContentBlock,
diff --git a/types/ebongarde-root/ebongarde-root-tests.ts b/types/ebongarde-root/ebongarde-root-tests.ts
index f40eec7172..7286f811c6 100644
--- a/types/ebongarde-root/ebongarde-root-tests.ts
+++ b/types/ebongarde-root/ebongarde-root-tests.ts
@@ -1,3 +1,3 @@
-import {ROOT} from 'ebongarde-root';
+import { ROOT } from 'ebongarde-root';
 
 console.log(ROOT);
diff --git a/types/electron-window-state/electron-window-state-tests.ts b/types/electron-window-state/electron-window-state-tests.ts
index 8a345d0ec9..62ba0599f7 100644
--- a/types/electron-window-state/electron-window-state-tests.ts
+++ b/types/electron-window-state/electron-window-state-tests.ts
@@ -1,6 +1,6 @@
 
 
-import {app, BrowserWindow} from 'electron';
+import { app, BrowserWindow } from 'electron';
 import windowStateKeeper = require('electron-window-state');
 
 let win: Electron.BrowserWindow = null;
diff --git a/types/epub/index.d.ts b/types/epub/index.d.ts
index fe4f36ce87..2c2480e91a 100644
--- a/types/epub/index.d.ts
+++ b/types/epub/index.d.ts
@@ -32,7 +32,7 @@
  **/
 declare module "epub" {
 
-	import {EventEmitter} from "events";
+	import { EventEmitter } from "events";
 
 	interface TocElement {
 		level: number;
diff --git a/types/expect/expect-tests.ts b/types/expect/expect-tests.ts
index 6238a63c60..41bdbe5581 100644
--- a/types/expect/expect-tests.ts
+++ b/types/expect/expect-tests.ts
@@ -1,6 +1,6 @@
 /// <reference types="mocha"" />
 
-import {Expectation, Extension, Spy, createSpy, isSpy, assert, spyOn, extend, restoreSpies} from 'expect';
+import { Expectation, Extension, Spy, createSpy, isSpy, assert, spyOn, extend, restoreSpies } from 'expect';
 import * as expect from 'expect';
 
 describe('chaining assertions', () => {
diff --git a/types/falcor-express/index.d.ts b/types/falcor-express/index.d.ts
index b149df75b9..c8a65e9f6c 100644
--- a/types/falcor-express/index.d.ts
+++ b/types/falcor-express/index.d.ts
@@ -7,6 +7,6 @@
 
 
 
-import {Request, Response, Handler} from 'express';
+import { Request, Response, Handler } from 'express';
 import {DataSource} from 'falcor';
 declare function dataSourceRoute(getDataSource: (req: Request, res: Response) => DataSource): Handler;
diff --git a/types/falcor-http-datasource/falcor-http-datasource-tests.ts b/types/falcor-http-datasource/falcor-http-datasource-tests.ts
index b341274a19..e014706df1 100644
--- a/types/falcor-http-datasource/falcor-http-datasource-tests.ts
+++ b/types/falcor-http-datasource/falcor-http-datasource-tests.ts
@@ -1,5 +1,5 @@
 import HttpDataSource from 'falcor-http-datasource';
-import {Model} from 'falcor';
+import { Model } from 'falcor';
 
 const model = new Model({
     source: new HttpDataSource('/model.json')
diff --git a/types/falcor-json-graph/falcor-json-graph-tests.ts b/types/falcor-json-graph/falcor-json-graph-tests.ts
index 992ede0053..1b082c4720 100644
--- a/types/falcor-json-graph/falcor-json-graph-tests.ts
+++ b/types/falcor-json-graph/falcor-json-graph-tests.ts
@@ -1,6 +1,6 @@
 
 
-import {Key, KeySet, Path, PathSet, ref, atom, error, pathValue, pathInvalidation} from 'falcor-json-graph';
+import { Key, KeySet, Path, PathSet, ref, atom, error, pathValue, pathInvalidation } from 'falcor-json-graph';
 
 const stringKey: Key = "productsById";
 const numberKey: Key = 10;
diff --git a/types/file-saver/file-saver-tests.ts b/types/file-saver/file-saver-tests.ts
index c76815a6fb..1cc06f58ba 100644
--- a/types/file-saver/file-saver-tests.ts
+++ b/types/file-saver/file-saver-tests.ts
@@ -1,6 +1,6 @@
 
 
-import {saveAs as importedSaveAs} from "file-saver";
+import { saveAs as importedSaveAs } from "file-saver";
 function testImportedSaveAs() {
     var data: Blob = new Blob(["Hello, world!"], {type: "text/plain;charset=utf-8"});
     var filename: string = 'hello world.txt';
diff --git a/types/finalhandler/finalhandler-tests.ts b/types/finalhandler/finalhandler-tests.ts
index af3550a4f4..81b9565404 100644
--- a/types/finalhandler/finalhandler-tests.ts
+++ b/types/finalhandler/finalhandler-tests.ts
@@ -1,5 +1,5 @@
 
-import {ServerRequest, ServerResponse} from "http";
+import { ServerRequest, ServerResponse } from "http";
 import * as finalHandler from "finalhandler";
 
 let req: ServerRequest;
diff --git a/types/finalhandler/index.d.ts b/types/finalhandler/index.d.ts
index a238c0d2a5..baad707772 100644
--- a/types/finalhandler/index.d.ts
+++ b/types/finalhandler/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import {ServerRequest, ServerResponse} from "http";
+import { ServerRequest, ServerResponse } from "http";
 
 declare function finalHandler(req: ServerRequest, res: ServerResponse, options?: finalHandler.Options): (err: any) => void;
 
diff --git a/types/fixed-data-table/fixed-data-table-tests.tsx b/types/fixed-data-table/fixed-data-table-tests.tsx
index 96c17a4a9a..cdbd46eb6c 100644
--- a/types/fixed-data-table/fixed-data-table-tests.tsx
+++ b/types/fixed-data-table/fixed-data-table-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import {Table, Cell, Column, CellProps} from "fixed-data-table";
+import { Table, Cell, Column, CellProps } from "fixed-data-table";
 
 // create your Table
 class MyTable1 extends React.Component {
diff --git a/types/flat/flat-tests.ts b/types/flat/flat-tests.ts
index 68699326c3..324ee3bb14 100644
--- a/types/flat/flat-tests.ts
+++ b/types/flat/flat-tests.ts
@@ -1,6 +1,6 @@
 
 
-import {flatten, unflatten} from "flat";
+import { flatten, unflatten } from "flat";
 
 namespace TestFlatten {
 	let options: {
diff --git a/types/geokdbush/index.d.ts b/types/geokdbush/index.d.ts
index 4ece8ff98d..117a1c10e9 100644
--- a/types/geokdbush/index.d.ts
+++ b/types/geokdbush/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Denis Carriere <https://github.com/DenisCarriere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {KDBush} from 'kdbush';
+import { KDBush } from 'kdbush';
 
 export function around<T>(
   index: KDBush<T>,
diff --git a/types/gl-matrix/gl-matrix-tests.ts b/types/gl-matrix/gl-matrix-tests.ts
index 6325ff5cd4..3642cca521 100644
--- a/types/gl-matrix/gl-matrix-tests.ts
+++ b/types/gl-matrix/gl-matrix-tests.ts
@@ -1,5 +1,5 @@
 // common
-import {vec2, mat2, mat3, mat4, vec3, vec4, mat2d, quat} from "gl-matrix";
+import { vec2, mat2, mat3, mat4, vec3, vec4, mat2d, quat } from "gl-matrix";
 
 var outVal: number;
 var outBool: boolean;
diff --git a/types/google-libphonenumber/google-libphonenumber-tests.ts b/types/google-libphonenumber/google-libphonenumber-tests.ts
index 9f6fd2e7e7..f9e7c4bf8e 100644
--- a/types/google-libphonenumber/google-libphonenumber-tests.ts
+++ b/types/google-libphonenumber/google-libphonenumber-tests.ts
@@ -1,6 +1,6 @@
 
 import libphonenumber = require('google-libphonenumber');
-import {PhoneNumberFormat, PhoneNumberUtil, AsYouTypeFormatter} from 'google-libphonenumber';
+import { PhoneNumberFormat, PhoneNumberUtil, AsYouTypeFormatter } from 'google-libphonenumber';
 
 () => {
     // Require `PhoneNumberFormat`.
diff --git a/types/graphql-date/graphql-date-tests.ts b/types/graphql-date/graphql-date-tests.ts
index 07542c8c0d..14a6882646 100644
--- a/types/graphql-date/graphql-date-tests.ts
+++ b/types/graphql-date/graphql-date-tests.ts
@@ -1,4 +1,4 @@
-import {GraphQLObjectType} from 'graphql';
+import { GraphQLObjectType } from 'graphql';
 import * as GraphQLDate from 'graphql-date';
 
 const fooType = new GraphQLObjectType({
diff --git a/types/graphql-date/index.d.ts b/types/graphql-date/index.d.ts
index 20cd74d61e..35ad44f7e1 100644
--- a/types/graphql-date/index.d.ts
+++ b/types/graphql-date/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Eric Naeseth <https://github.com/enaeseth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {GraphQLScalarType} from 'graphql';
+import { GraphQLScalarType } from 'graphql';
 
 declare const date: GraphQLScalarType;
 
diff --git a/types/graphql-type-json/graphql-type-json-tests.ts b/types/graphql-type-json/graphql-type-json-tests.ts
index 3282681845..8d2435270e 100644
--- a/types/graphql-type-json/graphql-type-json-tests.ts
+++ b/types/graphql-type-json/graphql-type-json-tests.ts
@@ -1,4 +1,4 @@
-import {GraphQLObjectType, GraphQLInputObjectType} from "graphql";
+import { GraphQLObjectType, GraphQLInputObjectType } from "graphql";
 import * as GraphQLJSON from "graphql-type-json";
 
 const TestType = new GraphQLObjectType({
diff --git a/types/graphql-type-json/index.d.ts b/types/graphql-type-json/index.d.ts
index 7d41b83013..c9549b946d 100644
--- a/types/graphql-type-json/index.d.ts
+++ b/types/graphql-type-json/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/taion/graphql-type-json#readme
 // Definitions by: Pavel Ivanov <https://github.com/schfkt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-import {GraphQLScalarType} from "graphql";
+import { GraphQLScalarType } from "graphql";
 
 declare const GraphQLJSON: GraphQLScalarType;
 export = GraphQLJSON;
diff --git a/types/gulp-watch/index.d.ts b/types/gulp-watch/index.d.ts
index f9855f09a6..8b96e78c97 100644
--- a/types/gulp-watch/index.d.ts
+++ b/types/gulp-watch/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import {SrcOptions} from "vinyl-fs";
+import { SrcOptions } from "vinyl-fs";
 
 interface IOptions extends SrcOptions {
     ignoreInitial?: boolean;
diff --git a/types/hapi-auth-jwt2/index.d.ts b/types/hapi-auth-jwt2/index.d.ts
index 2e5826e044..0109bfb33d 100644
--- a/types/hapi-auth-jwt2/index.d.ts
+++ b/types/hapi-auth-jwt2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://github.com/dwyl/hapi-auth-jwt2
 // Definitions by: Warren Seymour <http://github.com/warrenseymour>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-import {Request, Response, PluginFunction} from 'hapi';
+import { Request, Response, PluginFunction } from 'hapi';
 
 declare namespace hapiAuthJwt2 {
     /**
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index 91432e1d1f..789a181efd 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -42,7 +42,7 @@ import {
 type JoiValidationObject = JoiSchema | JoiSchemaMap | (JoiSchema | JoiSchemaMap)[];
 
 import * as Catbox from 'catbox';
-import {MimosOptions} from 'mimos';
+import { MimosOptions } from 'mimos';
 import Podium = require('podium');
 import * as Shot from 'shot';
 
diff --git a/types/iconv/iconv-tests.ts b/types/iconv/iconv-tests.ts
index 396c207279..d3d9bff917 100644
--- a/types/iconv/iconv-tests.ts
+++ b/types/iconv/iconv-tests.ts
@@ -1,5 +1,5 @@
 import Iconv = require("iconv");
-import {Writable} from "stream";
+import { Writable } from "stream";
 
 const iconv: Iconv.Iconv = new Iconv("utf-8", "cp932");
 const iconvFromFunction: Iconv.Iconv = Iconv("utf-8", "cp932");
diff --git a/types/inherits/index.d.ts b/types/inherits/index.d.ts
index 0c8b2f0f8c..4ae7eef4c5 100644
--- a/types/inherits/index.d.ts
+++ b/types/inherits/index.d.ts
@@ -6,5 +6,5 @@
 /// <reference types="node" />
 
 
-import {inherits} from "util";
+import { inherits } from "util";
 export = inherits;
diff --git a/types/japanese-holidays/japanese-holidays-tests.ts b/types/japanese-holidays/japanese-holidays-tests.ts
index 32f760360e..a3f77b2dc4 100644
--- a/types/japanese-holidays/japanese-holidays-tests.ts
+++ b/types/japanese-holidays/japanese-holidays-tests.ts
@@ -1,4 +1,4 @@
-import {isHoliday, isHolidayAt, getHolidaysOf} from 'japanese-holidays';
+import { isHoliday, isHolidayAt, getHolidaysOf } from 'japanese-holidays';
 
 const date = new Date(2017, 0, 9);
 const h: string | undefined = isHoliday(date);
diff --git a/types/jdenticon/jdenticon-tests.ts b/types/jdenticon/jdenticon-tests.ts
index b26a01696b..aaa5abc531 100644
--- a/types/jdenticon/jdenticon-tests.ts
+++ b/types/jdenticon/jdenticon-tests.ts
@@ -1,4 +1,4 @@
-import {jdenticon} from "jdenticon";
+import { jdenticon } from "jdenticon";
 
 function testJdenticon() {
   if (typeof jdenticon.version !== 'string') {
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 633af80085..267f1d4a1a 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -729,7 +729,7 @@ declare namespace jest {
     type TestResultsProcessor = (testResult: AggregatedResult) => AggregatedResult;
 
     type HasteResolver = any; // import HasteResolver from 'jest-resolve';
-    type ModuleMocker = any; // import {ModuleMocker} from 'jest-mock';
+    type ModuleMocker = any; // import { ModuleMocker } from 'jest-mock';
     type ModuleMap = any; // import {ModuleMap} from 'jest-haste-map';
     type HasteFS = any; // import {FS as HasteFS} from 'jest-haste-map';
     type Runtime = any; // import Runtime from 'jest-runtime';
diff --git a/types/jpm/jpm-tests.ts b/types/jpm/jpm-tests.ts
index 526bbe6063..34523f1a14 100644
--- a/types/jpm/jpm-tests.ts
+++ b/types/jpm/jpm-tests.ts
@@ -100,7 +100,7 @@ console.log(urls.toFilename(urls.URL("http://example.com")));
 console.log(urls.DataURL("file:///my/path/file.txt").mimeType);
 
 import * as windows from "sdk/windows";
-import {stringify} from "sdk/querystring";
+import { stringify } from "sdk/querystring";
 for (let window of windows.browserWindows) {
   console.info(window.title);
 }
diff --git a/types/json-socket/index.d.ts b/types/json-socket/index.d.ts
index cd38cf94c2..e496cdcaf5 100644
--- a/types/json-socket/index.d.ts
+++ b/types/json-socket/index.d.ts
@@ -7,7 +7,7 @@
 
 
 
-import {Socket} from "net";
+import { Socket } from "net";
 
 declare class JsonSocket extends Socket {
 
diff --git a/types/json-socket/json-socket-tests.ts b/types/json-socket/json-socket-tests.ts
index f8a4a4a1a7..84e4e6f1a1 100644
--- a/types/json-socket/json-socket-tests.ts
+++ b/types/json-socket/json-socket-tests.ts
@@ -1,6 +1,6 @@
 
 import JsonSocket = require("json-socket");
-import {Socket} from "net";
+import { Socket } from "net";
 
 JsonSocket.sendSingleMessage(42, "localhost", {foo: "bar"}, (err: Error) => {});
 JsonSocket.sendSingleMessageAndReceive(42, "localhost", {foo: "bar"}, (err: Error, message: any) => {});
diff --git a/types/jsoneditor/jsoneditor-tests.ts b/types/jsoneditor/jsoneditor-tests.ts
index 3c8b66d76b..cc659cfe04 100644
--- a/types/jsoneditor/jsoneditor-tests.ts
+++ b/types/jsoneditor/jsoneditor-tests.ts
@@ -1,4 +1,4 @@
-import JSONEditor, {JSONEditorMode, JSONEditorNode, JSONEditorOptions} from 'jsoneditor';
+import JSONEditor, {JSONEditorMode, JSONEditorNode, JSONEditorOptions } from 'jsoneditor';
 
 let options: JSONEditorOptions;
 options = {
diff --git a/types/jui-core/jui-core-tests.ts b/types/jui-core/jui-core-tests.ts
index a5d4f23bcb..64e97a9a11 100644
--- a/types/jui-core/jui-core-tests.ts
+++ b/types/jui-core/jui-core-tests.ts
@@ -1,4 +1,4 @@
-import {jui, UtilColor, UtilBase} from "jui-core";
+import { jui, UtilColor, UtilBase } from "jui-core";
 
 jui.ready(["util.color"], (color: UtilColor) => {
     console.log(color.rgb("#ff0000"));
diff --git a/types/jui-grid/jui-grid-tests.ts b/types/jui-grid/jui-grid-tests.ts
index 3b5bfa3db8..f2d1781b77 100644
--- a/types/jui-grid/jui-grid-tests.ts
+++ b/types/jui-grid/jui-grid-tests.ts
@@ -1,7 +1,7 @@
 /// <reference types="jquery" />
 
-import {jui} from 'jui-core';
-import {GridTable, GridXTable, GridRow} from "jui-grid";
+import { jui } from 'jui-core';
+import { GridTable, GridXTable, GridRow } from "jui-grid";
 
 jui.ready([ "grid.table" ], (table: GridTable) => {
     const table_1: GridTable = table("#table_1", {
diff --git a/types/jui/jui-tests.ts b/types/jui/jui-tests.ts
index 5cc6dd93f2..739c320604 100644
--- a/types/jui/jui-tests.ts
+++ b/types/jui/jui-tests.ts
@@ -1,4 +1,4 @@
-import {jui} from 'jui-core';
+import { jui } from 'jui-core';
 import {
     UIAccordion, UIAutoComplete, UIColorPicker, UICombo, UIDatePicker, UIDropdown, UIModal, UINotify,
     UIPaging, UIProgress, UIProperty, UISelect
diff --git a/types/kdbush/kdbush-tests.ts b/types/kdbush/kdbush-tests.ts
index fb7e268290..e552af4c19 100644
--- a/types/kdbush/kdbush-tests.ts
+++ b/types/kdbush/kdbush-tests.ts
@@ -1,5 +1,5 @@
 import * as kdbush from 'kdbush';
-import {KDBush} from 'kdbush';
+import { KDBush } from 'kdbush';
 
 // API
 const points = [[110, 60], [130, 40]];
diff --git a/types/koa-generic-session/koa-generic-session-tests.ts b/types/koa-generic-session/koa-generic-session-tests.ts
index e9a4f94232..e48d4dbef6 100644
--- a/types/koa-generic-session/koa-generic-session-tests.ts
+++ b/types/koa-generic-session/koa-generic-session-tests.ts
@@ -1,5 +1,5 @@
 import * as Koa from "koa";
-import {MemoryStore, Session} from "koa-generic-session";
+import { MemoryStore, Session } from "koa-generic-session";
 import session = require("koa-generic-session");
 
 const app = new Koa();
diff --git a/types/koa-helmet/index.d.ts b/types/koa-helmet/index.d.ts
index f97480f505..3e862fe6e6 100644
--- a/types/koa-helmet/index.d.ts
+++ b/types/koa-helmet/index.d.ts
@@ -11,7 +11,7 @@ import {
     IHelmetDnsPrefetchControlConfiguration,
     IHelmetHpkpConfiguration,
     IHelmetReferrerPolicyConfiguration } from 'helmet';
-import {Middleware, Context} from 'koa';
+import { Middleware, Context } from 'koa';
 
 declare namespace koaHelmet {
     type KoaHelmetContentSecurityPolicyDirectiveFunction = (ctx: Context) => string;
diff --git a/types/koa-redis/index.d.ts b/types/koa-redis/index.d.ts
index 94937c6455..1103665858 100644
--- a/types/koa-redis/index.d.ts
+++ b/types/koa-redis/index.d.ts
@@ -3,8 +3,8 @@
 // Definitions by: Nick Simmons <https://github.com/nsimmons>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {ClientOpts} from 'redis';
-import {SessionStore} from 'koa-generic-session';
+import { ClientOpts } from 'redis';
+import { SessionStore } from 'koa-generic-session';
 
 declare namespace redisStore {
     interface RedisOptions extends ClientOpts {
diff --git a/types/koa-redis/koa-redis-tests.ts b/types/koa-redis/koa-redis-tests.ts
index 68d557336c..21c8e010b0 100644
--- a/types/koa-redis/koa-redis-tests.ts
+++ b/types/koa-redis/koa-redis-tests.ts
@@ -1,5 +1,5 @@
 import * as Koa from "koa";
-import {MemoryStore, Session} from "koa-generic-session";
+import { MemoryStore, Session } from "koa-generic-session";
 import session = require("koa-generic-session");
 import redisStore = require("koa-redis");
 
diff --git a/types/libpq/index.d.ts b/types/libpq/index.d.ts
index d336d95c9f..1ad194eb14 100644
--- a/types/libpq/index.d.ts
+++ b/types/libpq/index.d.ts
@@ -6,8 +6,8 @@
 
 /// <reference types="node" />
 
-import {EventEmitter} from 'events';
-import {Buffer} from 'buffer';
+import { EventEmitter } from 'events';
+import { Buffer } from 'buffer';
 
 declare namespace Libpq {
     interface NotifyMsg {
diff --git a/types/libpq/libpq-tests.ts b/types/libpq/libpq-tests.ts
index b6afd997e5..fee968dabc 100644
--- a/types/libpq/libpq-tests.ts
+++ b/types/libpq/libpq-tests.ts
@@ -1,6 +1,6 @@
 /// <reference types="mocha" />
 
-import {Buffer} from 'buffer';
+import { Buffer } from 'buffer';
 import * as assert from 'assert';
 import * as async from 'async';
 import * as PQ from 'libpq';
diff --git a/types/ltx/index.d.ts b/types/ltx/index.d.ts
index b466521876..33311a3175 100644
--- a/types/ltx/index.d.ts
+++ b/types/ltx/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-export {Element} from './lib/Element';
+export {Element } from './lib/Element';
 export {nameEqual, attrsEqual, childrenEqual, equal} from './lib/equal';
 export {isNode, isElement, isText} from './lib/is';
 export {clone} from './lib/clone';
diff --git a/types/ltx/lib/Parser.d.ts b/types/ltx/lib/Parser.d.ts
index 3af418d21f..083e3ace66 100644
--- a/types/ltx/lib/Parser.d.ts
+++ b/types/ltx/lib/Parser.d.ts
@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import {EventEmitter} from 'events';
+import { EventEmitter } from 'events';
 export declare class Parser extends EventEmitter {
     constructor(options?: any);
 }
diff --git a/types/ltx/lib/createElement.d.ts b/types/ltx/lib/createElement.d.ts
index 2deead1663..c372f11150 100644
--- a/types/ltx/lib/createElement.d.ts
+++ b/types/ltx/lib/createElement.d.ts
@@ -1,2 +1,2 @@
-import {Element} from './Element';
+import { Element } from './Element';
 export declare function createElement(name: string, attrs: any): Element;
diff --git a/types/markdown-it-anchor/index.d.ts b/types/markdown-it-anchor/index.d.ts
index 93bcdac9f8..045082abf1 100644
--- a/types/markdown-it-anchor/index.d.ts
+++ b/types/markdown-it-anchor/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import {MarkdownIt, Core, Token} from 'markdown-it';
+import { MarkdownIt, Core, Token } from 'markdown-it';
 
 declare namespace anchor {
 	interface AnchorInfo {
diff --git a/types/mimos/index.d.ts b/types/mimos/index.d.ts
index 9d000b0ce9..06587e42db 100644
--- a/types/mimos/index.d.ts
+++ b/types/mimos/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import {DataStructure as MimeDbDataStructure} from 'mime-db';
+import { DataStructure as MimeDbDataStructure } from 'mime-db';
 
 /**
  *
diff --git a/types/mithril/test/test-class-component.ts b/types/mithril/test/test-class-component.ts
index 19f3aa343a..11e9fa3279 100644
--- a/types/mithril/test/test-class-component.ts
+++ b/types/mithril/test/test-class-component.ts
@@ -1,5 +1,5 @@
 import * as m from 'mithril';
-import {ClassComponent, Vnode, CVnode, CVnodeDOM} from 'mithril';
+import { ClassComponent, Vnode, CVnode, CVnodeDOM } from 'mithril';
 
 ///////////////////////////////////////////////////////////
 // 0.
diff --git a/types/mithril/test/test-component.ts b/types/mithril/test/test-component.ts
index 67e271329e..d1fec567d2 100644
--- a/types/mithril/test/test-component.ts
+++ b/types/mithril/test/test-component.ts
@@ -1,6 +1,6 @@
 import * as m from 'mithril';
 
-import {Comp, Component} from 'mithril';
+import { Comp, Component } from 'mithril';
 
 ///////////////////////////////////////////////////////////
 // 0.
diff --git a/types/mithril/test/test-factory-component.ts b/types/mithril/test/test-factory-component.ts
index 82ba4fd3c9..38faec9e4a 100644
--- a/types/mithril/test/test-factory-component.ts
+++ b/types/mithril/test/test-factory-component.ts
@@ -1,5 +1,5 @@
 import * as m from 'mithril';
-import {Component, FactoryComponent, Vnode} from 'mithril';
+import { Component, FactoryComponent, Vnode } from 'mithril';
 
 ///////////////////////////////////////////////////////////
 // 0.
diff --git a/types/mithril/test/test-fragment.ts b/types/mithril/test/test-fragment.ts
index f67d39b7ad..097831d3ed 100644
--- a/types/mithril/test/test-fragment.ts
+++ b/types/mithril/test/test-fragment.ts
@@ -1,5 +1,5 @@
 import * as m from 'mithril';
-import {Vnode} from 'mithril/';
+import { Vnode } from 'mithril/';
 import * as h from 'mithril/hyperscript';
 
 const vnode = m.fragment({id: 'abc'}, ['test']);
diff --git a/types/mithril/test/test-jsonp.ts b/types/mithril/test/test-jsonp.ts
index 7abad457e4..4c51807363 100644
--- a/types/mithril/test/test-jsonp.ts
+++ b/types/mithril/test/test-jsonp.ts
@@ -1,4 +1,4 @@
-import {jsonp} from 'mithril/request';
+import { jsonp } from 'mithril/request';
 
 interface Result {
 	id: number;
diff --git a/types/mithril/test/test-misc.ts b/types/mithril/test/test-misc.ts
index 93ac049ef3..fbb7e83d36 100644
--- a/types/mithril/test/test-misc.ts
+++ b/types/mithril/test/test-misc.ts
@@ -1,7 +1,7 @@
-import {trust, parseQueryString, buildQueryString} from 'mithril';
+import { trust, parseQueryString, buildQueryString } from 'mithril';
 import * as h from 'mithril/hyperscript';
-import {render} from 'mithril/render';
-import {redraw} from 'mithril/redraw';
+import { render } from 'mithril/render';
+import { redraw } from 'mithril/redraw';
 import * as withAttr from 'mithril/withAttr';
 
 const vnode = trust('Some <strong>bold</strong> text.');
diff --git a/types/mithril/test/test-request.ts b/types/mithril/test/test-request.ts
index 99d1bc1ef3..5bc0e3b242 100644
--- a/types/mithril/test/test-request.ts
+++ b/types/mithril/test/test-request.ts
@@ -1,4 +1,4 @@
-import {request} from 'mithril/request';
+import { request } from 'mithril/request';
 
 interface Result {
 	id: number;
diff --git a/types/mithril/test/test-route.ts b/types/mithril/test/test-route.ts
index e3ca4e4aa6..d8acdd092c 100644
--- a/types/mithril/test/test-route.ts
+++ b/types/mithril/test/test-route.ts
@@ -1,4 +1,4 @@
-import {Component, Comp, RouteResolver} from 'mithril';
+import { Component, Comp, RouteResolver } from 'mithril';
 import * as h from 'mithril/hyperscript';
 import * as route from 'mithril/route';
 
diff --git a/types/mithril/test/test-stream.ts b/types/mithril/test/test-stream.ts
index 288a59fdd3..7fcb6a0372 100644
--- a/types/mithril/test/test-stream.ts
+++ b/types/mithril/test/test-stream.ts
@@ -1,5 +1,5 @@
 import * as stream from 'mithril/stream';
-import {Stream} from 'mithril/stream';
+import { Stream } from 'mithril/stream';
 
 {
 	const s = stream(1);
diff --git a/types/mongoose/README.md b/types/mongoose/README.md
index 822e66d1f6..ad12702574 100644
--- a/types/mongoose/README.md
+++ b/types/mongoose/README.md
@@ -21,7 +21,7 @@ var MySchema: mongoose.Schema = new mongoose.Schema(...);
 
 Alternatively, you can import individual names and call them:
 ```typescript
-import {model, Schema} from 'mongoose';
+import { model, Schema } from 'mongoose';
 var MyModel = model(...);
 var MySchema: Schema = new Schema(...):
 ```
diff --git a/types/moxios/index.d.ts b/types/moxios/index.d.ts
index 94756158c9..2ff3694ba4 100644
--- a/types/moxios/index.d.ts
+++ b/types/moxios/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Asuka Ito <https://github.com/itoasuka/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {AxiosInstance} from "axios";
+import { AxiosInstance } from "axios";
 
 interface Item {
     response?: any;
diff --git a/types/moxios/moxios-tests.ts b/types/moxios/moxios-tests.ts
index 0e6820d287..4dde304435 100644
--- a/types/moxios/moxios-tests.ts
+++ b/types/moxios/moxios-tests.ts
@@ -1,5 +1,5 @@
 // from https://github.com/mzabriskie/moxios/blob/master/test.js
-import {equal, notEqual, deepEqual} from 'power-assert'; // compatible with 'assert';
+import { equal, notEqual, deepEqual } from 'power-assert'; // compatible with 'assert';
 import axios from 'axios';
 import * as moxios from 'moxios';
 
diff --git a/types/multer-gridfs-storage/index.d.ts b/types/multer-gridfs-storage/index.d.ts
index 752609b4e3..93cf650bb8 100644
--- a/types/multer-gridfs-storage/index.d.ts
+++ b/types/multer-gridfs-storage/index.d.ts
@@ -3,10 +3,10 @@
 // Definitions by: devconcept <https://github.com/devconcept/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {EventEmitter} from 'events';
-import {Express} from 'express';
+import { EventEmitter } from 'events';
+import { Express } from 'express';
 import * as Multer from 'multer';
-import {Grid} from 'gridfs-stream';
+import { Grid } from 'gridfs-stream';
 
 type logConfig = 'file' | 'all';
 
diff --git a/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts b/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts
index 229fd7877d..b341fe0cea 100644
--- a/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts
+++ b/types/multer-gridfs-storage/multer-gridfs-storage-tests.ts
@@ -1,5 +1,5 @@
 import * as MulterGridfsStorage from 'multer-gridfs-storage';
-import {Grid} from "gridfs-stream";
+import { Grid } from "gridfs-stream";
 
 // Exported interfaces
 let opt1: MulterGridfsStorage.GfsStorageOptions;
diff --git a/types/musicmetadata/index.d.ts b/types/musicmetadata/index.d.ts
index 4f80854138..30577e7455 100644
--- a/types/musicmetadata/index.d.ts
+++ b/types/musicmetadata/index.d.ts
@@ -6,7 +6,7 @@
 /// <reference types="node" />
 
 declare module "musicmetadata" {
-    import {Readable} from "stream";
+    import { Readable } from "stream";
     import {EventEmitter} from "events";
 
     function mm(readStream: Readable, callback: (err: Error, metadata: MM.Metadata) => void): EventEmitter;
diff --git a/types/node-mysql-wrapper/index.d.ts b/types/node-mysql-wrapper/index.d.ts
index c887da3368..4960794a90 100644
--- a/types/node-mysql-wrapper/index.d.ts
+++ b/types/node-mysql-wrapper/index.d.ts
@@ -8,7 +8,7 @@
 
 import * as Mysql from 'mysql';
 import * as Promise from 'bluebird';
-import {EventEmitter} from 'events';
+import { EventEmitter } from 'events';
 
 declare var EQUAL_TO_PROPERTY_SYMBOL: string;
 declare var TABLE_RULES_PROPERTY: string;
diff --git a/types/node-static/node-static-tests.ts b/types/node-static/node-static-tests.ts
index 471a8fde50..c118103f1e 100644
--- a/types/node-static/node-static-tests.ts
+++ b/types/node-static/node-static-tests.ts
@@ -1,4 +1,4 @@
-import {Server, version, mime} from 'node-static';
+import { Server, version, mime } from 'node-static';
 
 let server = new Server(__dirname);
 let pathname = server.resolve('./tsconfig.json');
diff --git a/types/node-xmpp-client/node-xmpp-client-tests.ts b/types/node-xmpp-client/node-xmpp-client-tests.ts
index 4b5bd72a28..e0cd32a417 100644
--- a/types/node-xmpp-client/node-xmpp-client-tests.ts
+++ b/types/node-xmpp-client/node-xmpp-client-tests.ts
@@ -1,4 +1,4 @@
-import {Client} from 'node-xmpp-client';
+import { Client } from 'node-xmpp-client';
 
 const client = new Client({
     jid: 'user@example.com',
diff --git a/types/node-xmpp-core/index.d.ts b/types/node-xmpp-core/index.d.ts
index 8c552c08f2..20937aae98 100644
--- a/types/node-xmpp-core/index.d.ts
+++ b/types/node-xmpp-core/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 /// <reference types="node" />
-import {Element} from 'ltx';
-import {EventEmitter} from 'events';
+import { Element } from 'ltx';
+import { EventEmitter } from 'events';
 
 // fixme: not ideal
 export {createElement, Element, escapeXML, escapeXMLText} from 'ltx';
diff --git a/types/node-xmpp-core/node-xmpp-core-tests.ts b/types/node-xmpp-core/node-xmpp-core-tests.ts
index 0b0e7016ff..6a6fac9644 100644
--- a/types/node-xmpp-core/node-xmpp-core-tests.ts
+++ b/types/node-xmpp-core/node-xmpp-core-tests.ts
@@ -1,4 +1,4 @@
-import {Connection} from 'node-xmpp-core';
+import { Connection } from 'node-xmpp-core';
 
 const con = new Connection();
 con.on('online', () => {
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index 4c2f5de484..f8c58828bf 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -29,7 +29,7 @@ import * as dns from "dns";
 import * as async_hooks from "async_hooks";
 
 // Specifically test buffer module regression.
-import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
 
 //////////////////////////////////////////////////////////
 /// Global Tests : https://nodejs.org/api/global.html  ///
diff --git a/types/node/v4/node-tests.ts b/types/node/v4/node-tests.ts
index 16a035f08e..94e32eee63 100644
--- a/types/node/v4/node-tests.ts
+++ b/types/node/v4/node-tests.ts
@@ -22,7 +22,7 @@ import * as string_decoder from "string_decoder";
 import * as dns from "dns";
 
 // Specifically test buffer module regression.
-import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
 
 //////////////////////////////////////////////////////////
 /// Global Tests : https://nodejs.org/api/global.html  ///
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 492b9e36df..982ce3bf41 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -27,7 +27,7 @@ import * as repl from "repl";
 import * as dns from "dns";
 
 // Specifically test buffer module regression.
-import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
 
 //////////////////////////////////////////////////////////
 /// Global Tests : https://nodejs.org/api/global.html  ///
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index b89adb57ae..552c7b4b06 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -28,7 +28,7 @@ import * as v8 from "v8";
 import * as dns from "dns";
 
 // Specifically test buffer module regression.
-import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer";
+import { Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer } from "buffer";
 
 //////////////////////////////////////////////////////////
 /// Global Tests : https://nodejs.org/api/global.html  ///
diff --git a/types/nodegit/blame-options.d.ts b/types/nodegit/blame-options.d.ts
index fdebbeff67..3505e7cf0a 100644
--- a/types/nodegit/blame-options.d.ts
+++ b/types/nodegit/blame-options.d.ts
@@ -1,4 +1,4 @@
-import {Oid} from './oid';
+import { Oid } from './oid';
 
 export class BlameOptions {
     /**
diff --git a/types/nodegit/blame.d.ts b/types/nodegit/blame.d.ts
index 684db81b6c..79fc6a85b4 100644
--- a/types/nodegit/blame.d.ts
+++ b/types/nodegit/blame.d.ts
@@ -1,6 +1,6 @@
 import { Repository } from './repository';
 import { BlameOptions } from './blame-options';
-import {BlameHunk} from './blame-hunk';
+import { BlameHunk } from './blame-hunk';
 
 export namespace Blame {
     const enum FLAG {
diff --git a/types/nodegit/fetch-options.d.ts b/types/nodegit/fetch-options.d.ts
index 3b3a1b26c1..d391b8dab1 100644
--- a/types/nodegit/fetch-options.d.ts
+++ b/types/nodegit/fetch-options.d.ts
@@ -1,5 +1,5 @@
 import { RemoteCallbacks } from './remote-callbacks';
-import { Strarray} from './str-array';
+import { Strarray } from './str-array';
 
 export interface FetchOptions {
     /**
diff --git a/types/nodegit/note.d.ts b/types/nodegit/note.d.ts
index e1412afe3c..c5d06f63a7 100644
--- a/types/nodegit/note.d.ts
+++ b/types/nodegit/note.d.ts
@@ -1,6 +1,6 @@
-import {Repository} from './repository';
-import {Signature} from './signature';
-import {Oid} from './oid';
+import { Repository } from './repository';
+import { Signature } from './signature';
+import { Oid } from './oid';
 
 export class Note {
     /**
diff --git a/types/observe-js/observe-js-tests.ts b/types/observe-js/observe-js-tests.ts
index 23dc1159f3..130bc7cd77 100644
--- a/types/observe-js/observe-js-tests.ts
+++ b/types/observe-js/observe-js-tests.ts
@@ -1,4 +1,4 @@
-import {PathObserver, ArrayObserver, ObjectObserver, CompoundObserver, ObserverTransform} from 'observe-js';
+import { PathObserver, ArrayObserver, ObjectObserver, CompoundObserver, ObserverTransform } from 'observe-js';
 
 namespace observejs {
 
diff --git a/types/osmtogeojson/osmtogeojson-tests.ts b/types/osmtogeojson/osmtogeojson-tests.ts
index 429dda705f..8356ec5a1b 100644
--- a/types/osmtogeojson/osmtogeojson-tests.ts
+++ b/types/osmtogeojson/osmtogeojson-tests.ts
@@ -1,5 +1,5 @@
 import osmtogeojson from 'osmtogeojson';
-import {OsmJSON, GeoJSON} from 'osmtogeojson';
+import { OsmJSON, GeoJSON } from 'osmtogeojson';
 import * as xmldom from 'xmldom';
 
 let xml: Document = (new xmldom.DOMParser()).parseFromString("<osm><node id='1' lat='1.234' lon='4.321' /></osm>", 'text/xml');
diff --git a/types/passport-client-cert/index.d.ts b/types/passport-client-cert/index.d.ts
index 5bb80c5027..3bd79d312a 100644
--- a/types/passport-client-cert/index.d.ts
+++ b/types/passport-client-cert/index.d.ts
@@ -4,8 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-import {Strategy as PassportStrategy} from 'passport-strategy';
-import {Request} from 'express';
+import { Strategy as PassportStrategy } from 'passport-strategy';
+import { Request } from 'express';
 
 export class Strategy extends PassportStrategy {
     constructor(verify: PkiCallback);
diff --git a/types/passport-client-cert/passport-client-cert-tests.ts b/types/passport-client-cert/passport-client-cert-tests.ts
index 256d2ddcd6..de1498525f 100644
--- a/types/passport-client-cert/passport-client-cert-tests.ts
+++ b/types/passport-client-cert/passport-client-cert-tests.ts
@@ -1,5 +1,5 @@
 import * as passport from "passport";
-import {ClientCert, PkiVerifiedCallback, Strategy as ClientCertStrategy} from "passport-client-cert";
+import { ClientCert, PkiVerifiedCallback, Strategy as ClientCertStrategy } from "passport-client-cert";
 
 passport.use(new ClientCertStrategy( (clientCert: ClientCert, done: PkiVerifiedCallback) => {
     let cn = clientCert.subject.cn;
diff --git a/types/passport-google-oauth2/index.d.ts b/types/passport-google-oauth2/index.d.ts
index 5c131622e7..a2ba210c4b 100644
--- a/types/passport-google-oauth2/index.d.ts
+++ b/types/passport-google-oauth2/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import {Request} from 'express';
+import { Request } from 'express';
 
 export interface StrategyOptions {
   clientID: string;
diff --git a/types/passport-jwt/index.d.ts b/types/passport-jwt/index.d.ts
index 066921efe6..207f0ad945 100644
--- a/types/passport-jwt/index.d.ts
+++ b/types/passport-jwt/index.d.ts
@@ -4,7 +4,7 @@
 //                 Alex Young <https://github.com/alsiola/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {Strategy as PassportStrategy} from 'passport-strategy';
+import { Strategy as PassportStrategy } from 'passport-strategy';
 import {Request} from 'express';
 
 export declare class Strategy extends PassportStrategy {
diff --git a/types/passport-jwt/passport-jwt-tests.ts b/types/passport-jwt/passport-jwt-tests.ts
index 1dd2baeb1e..024a06cfef 100644
--- a/types/passport-jwt/passport-jwt-tests.ts
+++ b/types/passport-jwt/passport-jwt-tests.ts
@@ -2,7 +2,7 @@
 /// <reference types="passport" />
 'use strict';
 
-import {Strategy as JwtStrategy, ExtractJwt, StrategyOptions} from 'passport-jwt';
+import { Strategy as JwtStrategy, ExtractJwt, StrategyOptions } from 'passport-jwt';
 import {Request} from 'express';
 import * as passport from 'passport';
 
diff --git a/types/password-hash/password-hash-tests.ts b/types/password-hash/password-hash-tests.ts
index 92f7a93f17..a8da4b01b8 100644
--- a/types/password-hash/password-hash-tests.ts
+++ b/types/password-hash/password-hash-tests.ts
@@ -1,7 +1,7 @@
 
 'use strict';
 
-import {generate, verify, isHashed} from 'password-hash';
+import { generate, verify, isHashed } from 'password-hash';
 
 let password = 'raw-password';
 let hashed: string;
diff --git a/types/pg-pool/index.d.ts b/types/pg-pool/index.d.ts
index 7887ddc82f..0a27987bb5 100644
--- a/types/pg-pool/index.d.ts
+++ b/types/pg-pool/index.d.ts
@@ -4,4 +4,4 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="pg" />
-export {Pool, PoolConfig} from "pg";
+export {Pool, PoolConfig } from "pg";
diff --git a/types/pg-pool/pg-pool-tests.ts b/types/pg-pool/pg-pool-tests.ts
index 13c2a7c4ec..a2995fd747 100644
--- a/types/pg-pool/pg-pool-tests.ts
+++ b/types/pg-pool/pg-pool-tests.ts
@@ -1,4 +1,4 @@
-import {Pool} from "pg-pool";
+import { Pool } from "pg-pool";
 
 let pool = new Pool()
 
diff --git a/types/prompt-sync-history/index.d.ts b/types/prompt-sync-history/index.d.ts
index 09ac3af5b3..de7bc637b2 100644
--- a/types/prompt-sync-history/index.d.ts
+++ b/types/prompt-sync-history/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: TANAKA Koichi <https://github.com/MugeSo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {History} from 'prompt-sync';
+import { History } from 'prompt-sync';
 
 declare namespace history {}
 declare function history(file?:string, max?:number): History;
diff --git a/types/prosemirror-collab/prosemirror-collab-tests.ts b/types/prosemirror-collab/prosemirror-collab-tests.ts
index 8970399c59..b128ec5d9f 100644
--- a/types/prosemirror-collab/prosemirror-collab-tests.ts
+++ b/types/prosemirror-collab/prosemirror-collab-tests.ts
@@ -1,5 +1,5 @@
 import * as collab from 'prosemirror-collab';
-import {EditorState} from 'prosemirror-state';
+import { EditorState } from 'prosemirror-state';
 
 let state = new EditorState();
 let version = collab.getVersion(state);
diff --git a/types/prosemirror-history/prosemirror-history-tests.ts b/types/prosemirror-history/prosemirror-history-tests.ts
index 3beccd390b..10134e9db7 100644
--- a/types/prosemirror-history/prosemirror-history-tests.ts
+++ b/types/prosemirror-history/prosemirror-history-tests.ts
@@ -1,5 +1,5 @@
 import * as history from 'prosemirror-history';
-import {EditorState} from 'prosemirror-state';
+import { EditorState } from 'prosemirror-state';
 
 let state = new EditorState();
 history.undo(state);
diff --git a/types/react-bytesize-icons/react-bytesize-icons-tests.tsx b/types/react-bytesize-icons/react-bytesize-icons-tests.tsx
index 6d73100fe2..36eba21342 100644
--- a/types/react-bytesize-icons/react-bytesize-icons-tests.tsx
+++ b/types/react-bytesize-icons/react-bytesize-icons-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {render} from 'react-dom';
+import { render } from 'react-dom';
 import {Activity, External, Export} from 'react-bytesize-icons';
 
 render(<Activity/>, document.getElementById('test'));
diff --git a/types/react-chartjs-2/test/doughnut.tsx b/types/react-chartjs-2/test/doughnut.tsx
index 268ddfe40e..6a25d0354b 100755
--- a/types/react-chartjs-2/test/doughnut.tsx
+++ b/types/react-chartjs-2/test/doughnut.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Doughnut} from 'react-chartjs-2';
+import { Doughnut } from 'react-chartjs-2';
 
 const data = {
 	labels: [
diff --git a/types/react-chartjs-2/test/horizontalBar.tsx b/types/react-chartjs-2/test/horizontalBar.tsx
index 4d6381749d..bf66f6b9fc 100755
--- a/types/react-chartjs-2/test/horizontalBar.tsx
+++ b/types/react-chartjs-2/test/horizontalBar.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {HorizontalBar} from 'react-chartjs-2';
+import { HorizontalBar } from 'react-chartjs-2';
 
 const data = {
   labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
diff --git a/types/react-chartjs-2/test/line.tsx b/types/react-chartjs-2/test/line.tsx
index fb60416e4a..55b0ad73fd 100755
--- a/types/react-chartjs-2/test/line.tsx
+++ b/types/react-chartjs-2/test/line.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Line} from 'react-chartjs-2';
+import { Line } from 'react-chartjs-2';
 
 const data = {
   labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
diff --git a/types/react-chartjs-2/test/pie.tsx b/types/react-chartjs-2/test/pie.tsx
index 454088331d..9fb1912f5b 100755
--- a/types/react-chartjs-2/test/pie.tsx
+++ b/types/react-chartjs-2/test/pie.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Pie} from 'react-chartjs-2';
+import { Pie } from 'react-chartjs-2';
 
 const data = {
 	labels: [
diff --git a/types/react-chartjs-2/test/polar.tsx b/types/react-chartjs-2/test/polar.tsx
index b38fc9b44f..d586ca44be 100755
--- a/types/react-chartjs-2/test/polar.tsx
+++ b/types/react-chartjs-2/test/polar.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Polar} from 'react-chartjs-2';
+import { Polar } from 'react-chartjs-2';
 
 const data = {
   datasets: [{
diff --git a/types/react-chartjs-2/test/radar.tsx b/types/react-chartjs-2/test/radar.tsx
index fb4535d5e3..5c6dbc7c7d 100755
--- a/types/react-chartjs-2/test/radar.tsx
+++ b/types/react-chartjs-2/test/radar.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Radar} from 'react-chartjs-2';
+import { Radar } from 'react-chartjs-2';
 
 const data = {
   labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'],
diff --git a/types/react-dates/react-dates-tests.tsx b/types/react-dates/react-dates-tests.tsx
index c775480a2f..e8dd3752b3 100644
--- a/types/react-dates/react-dates-tests.tsx
+++ b/types/react-dates/react-dates-tests.tsx
@@ -11,7 +11,7 @@ import {
         isSameDay,
         toISODateString,
         toLocalizedDateString,
-        toMomentObject} from "react-dates";
+        toMomentObject } from "react-dates";
 
 
 
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index d0477e3e4c..3bf54cdc2b 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import { DragEvent, SyntheticEvent} from "react";
+import { DragEvent, SyntheticEvent } from "react";
 import Dropzone = require("react-dropzone");
 import { ImageFile } from "react-dropzone";
 
diff --git a/types/react-hamburger-menu/react-hamburger-menu-tests.tsx b/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
index 26d91e344c..d9a6b34463 100644
--- a/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
+++ b/types/react-hamburger-menu/react-hamburger-menu-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from "react";
-import HamburgerMenu, {HamburgerMenuProps} from "react-hamburger-menu";
+import HamburgerMenu, { HamburgerMenuProps } from "react-hamburger-menu";
 
 export class ReactHamburgerMenuTest extends React.PureComponent<{}, State> {
     state: State = {isOpen: false};
diff --git a/types/react-icons/react-icons-tests.tsx b/types/react-icons/react-icons-tests.tsx
index 584776c0af..83b9196a70 100644
--- a/types/react-icons/react-icons-tests.tsx
+++ b/types/react-icons/react-icons-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import FaBeer from 'react-icons/fa/beer';
-import {FaExclamation} from 'react-icons/fa';
+import { FaExclamation } from 'react-icons/fa';
 
 class Question extends React.Component {
     render() {
diff --git a/types/react-intl/v1/react-intl-tests.tsx b/types/react-intl/v1/react-intl-tests.tsx
index 33abc5890d..298f05f6ed 100644
--- a/types/react-intl/v1/react-intl-tests.tsx
+++ b/types/react-intl/v1/react-intl-tests.tsx
@@ -5,7 +5,7 @@
 import * as React from 'react'
 
 import * as reactMixin from 'react-mixin'
-import {IntlMixin, IntlComponent, FormattedNumber, FormattedMessage, FormattedDate} from 'react-intl'
+import { IntlMixin, IntlComponent, FormattedNumber, FormattedMessage, FormattedDate } from 'react-intl'
 
 
 ///////////////////////////////////////////////////////////////////////////
diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
index 7ec2ae156c..3c4ae99805 100644
--- a/types/react-lazyload/index.d.ts
+++ b/types/react-lazyload/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import {Component} from 'react';
+import { Component } from 'react';
 
 export interface LazyLoadProps {
     once?: boolean;
diff --git a/types/react-mdl/react-mdl-tests.tsx b/types/react-mdl/react-mdl-tests.tsx
index 9243eaa32c..e9405820fe 100644
--- a/types/react-mdl/react-mdl-tests.tsx
+++ b/types/react-mdl/react-mdl-tests.tsx
@@ -2,7 +2,7 @@
 
 
 import * as React from 'react';
-import {Chip, ChipContact,
+import { Chip, ChipContact,
     Badge,
     FABButton, Button, IconButton,
     Card, CardActions, CardTitle, CardText, CardMenu, CardMedia,
@@ -23,7 +23,7 @@ import {Chip, ChipContact,
     Tabs, Tab,
     Textfield,
     Tooltip,
-    MDLComponent} from 'react-mdl';
+    MDLComponent } from 'react-mdl';
 
 // all tests are from the examples provided here: https://tleunen.github.io/react-mdl/
 
diff --git a/types/react-motion/react-motion-tests.tsx b/types/react-motion/react-motion-tests.tsx
index 3a672db6d6..71aab1bfab 100644
--- a/types/react-motion/react-motion-tests.tsx
+++ b/types/react-motion/react-motion-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {StaggeredMotion, Motion, spring, TransitionMotion, TransitionPlainStyle, TransitionStyle, Style, PlainStyle} from 'react-motion';
+import { StaggeredMotion, Motion, spring, TransitionMotion, TransitionPlainStyle, TransitionStyle, Style, PlainStyle } from 'react-motion';
 
 class Root extends React.Component {
     render() {
diff --git a/types/react-native-fetch-blob/react-native-fetch-blob-tests.ts b/types/react-native-fetch-blob/react-native-fetch-blob-tests.ts
index d276a0a7ab..33698e8caf 100644
--- a/types/react-native-fetch-blob/react-native-fetch-blob-tests.ts
+++ b/types/react-native-fetch-blob/react-native-fetch-blob-tests.ts
@@ -1,4 +1,4 @@
-import {RNFetchBlob} from "react-native-fetch-blob";
+import { RNFetchBlob } from "react-native-fetch-blob";
 
 let BASE64_IMAGE_STRING = 'some base64 image';
 let PATH_TO_THE_FILE = '/some/path.png';
diff --git a/types/react-native-sortable-list/react-native-sortable-list-tests.tsx b/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
index 8940484ab2..6518118173 100644
--- a/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
+++ b/types/react-native-sortable-list/react-native-sortable-list-tests.tsx
@@ -12,7 +12,7 @@ import {
     TextStyle,
     ImageStyle,
 } from 'react-native';
-import SortableList, {RowProps} from 'react-native-sortable-list';
+import SortableList, {RowProps } from 'react-native-sortable-list';
 
 const window = Dimensions.get('window');
 
diff --git a/types/react-redux-toastr/react-redux-toastr-tests.ts b/types/react-redux-toastr/react-redux-toastr-tests.ts
index c76208171c..f675bf5c78 100644
--- a/types/react-redux-toastr/react-redux-toastr-tests.ts
+++ b/types/react-redux-toastr/react-redux-toastr-tests.ts
@@ -1,4 +1,4 @@
-import {toastr, reducer as toastrReducer, actions} from 'react-redux-toastr';
+import { toastr, reducer as toastrReducer, actions } from 'react-redux-toastr';
 import ReduxToastr from 'react-redux-toastr';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
diff --git a/types/react-router-native/react-router-native-tests.tsx b/types/react-router-native/react-router-native-tests.tsx
index 40cd5b8532..17888e56f7 100644
--- a/types/react-router-native/react-router-native-tests.tsx
+++ b/types/react-router-native/react-router-native-tests.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import {StyleSheet, Text, View} from 'react-native';
-import {NativeRouter as Router, Route, Link} from 'react-router-native';
+import { StyleSheet, Text, View } from 'react-native';
+import { NativeRouter as Router, Route, Link } from 'react-router-native';
 
 const Home: React.SFC<{}> = () => {
   return (
diff --git a/types/react-sticky/react-sticky-tests.tsx b/types/react-sticky/react-sticky-tests.tsx
index 6eb9d0e0d0..f7cc460611 100644
--- a/types/react-sticky/react-sticky-tests.tsx
+++ b/types/react-sticky/react-sticky-tests.tsx
@@ -1,4 +1,4 @@
-import {Sticky, StickyContainer} from "react-sticky";
+import { Sticky, StickyContainer } from "react-sticky";
 import * as React from "react";
 
 const StickyAllOptions: JSX.Element =
diff --git a/types/react-tagcloud/react-tagcloud-tests.tsx b/types/react-tagcloud/react-tagcloud-tests.tsx
index efdbfab378..4d4382db6d 100644
--- a/types/react-tagcloud/react-tagcloud-tests.tsx
+++ b/types/react-tagcloud/react-tagcloud-tests.tsx
@@ -1,7 +1,7 @@
 // simple cloud
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import {TagCloud, DefaultRenderer} from "react-tagcloud";
+import { TagCloud, DefaultRenderer } from "react-tagcloud";
 
 let data = [
     { value: "jQuery", count: 25 }, { value: "MongoDB", count: 18 },
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index 3f6a6d8a35..e0bd1d50ed 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -1656,7 +1656,7 @@ export class TableExample extends PureComponent<{}, any> {
     }
 }
 
-import {TableCellProps} from "react-virtualized"
+import { TableCellProps } from "react-virtualized"
 
 export class DynamicHeightTableColumnExample extends PureComponent<any, any> {
     state;
diff --git a/types/react-widgets/lib/Calendar.d.ts b/types/react-widgets/lib/Calendar.d.ts
index 1f68410dd9..d9d0a6d540 100644
--- a/types/react-widgets/lib/Calendar.d.ts
+++ b/types/react-widgets/lib/Calendar.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonProps} from './CommonProps';
+import { ReactWidgetsCommonProps } from './CommonProps';
 
 interface CalendarProps extends ReactWidgetsCommonProps<CalendarClass>{
     /**
diff --git a/types/react-widgets/lib/Combobox.d.ts b/types/react-widgets/lib/Combobox.d.ts
index 473919f31d..a3b6aadb94 100644
--- a/types/react-widgets/lib/Combobox.d.ts
+++ b/types/react-widgets/lib/Combobox.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonDropdownProps} from './CommonProps';
+import { ReactWidgetsCommonDropdownProps } from './CommonProps';
 
 interface ComboBoxMessages {
     /**
diff --git a/types/react-widgets/lib/DateTimePicker.d.ts b/types/react-widgets/lib/DateTimePicker.d.ts
index 87f95a15e9..2f2f520cf2 100644
--- a/types/react-widgets/lib/DateTimePicker.d.ts
+++ b/types/react-widgets/lib/DateTimePicker.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonDropdownProps} from './CommonProps';
+import { ReactWidgetsCommonDropdownProps } from './CommonProps';
 
 interface DateTimePickerProps extends ReactWidgetsCommonDropdownProps<DateTimePickerClass> {
     /**
diff --git a/types/react-widgets/lib/DropdownList.d.ts b/types/react-widgets/lib/DropdownList.d.ts
index b0aebc1de8..06ae39619b 100644
--- a/types/react-widgets/lib/DropdownList.d.ts
+++ b/types/react-widgets/lib/DropdownList.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonDropdownProps} from './CommonProps';
+import { ReactWidgetsCommonDropdownProps } from './CommonProps';
 
 interface DropdownListProps extends ReactWidgetsCommonDropdownProps<DropdownListClass> {
     /**
diff --git a/types/react-widgets/lib/Multiselect.d.ts b/types/react-widgets/lib/Multiselect.d.ts
index 0b528dd14c..8f3b5591f2 100644
--- a/types/react-widgets/lib/Multiselect.d.ts
+++ b/types/react-widgets/lib/Multiselect.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonDropdownProps} from './CommonProps';
+import { ReactWidgetsCommonDropdownProps } from './CommonProps';
 
 interface MultiselectProps extends ReactWidgetsCommonDropdownProps<MultiselectClass> {
     /**
diff --git a/types/react-widgets/lib/NumberPicker.d.ts b/types/react-widgets/lib/NumberPicker.d.ts
index 59f46ee3c1..0feaee5bf1 100644
--- a/types/react-widgets/lib/NumberPicker.d.ts
+++ b/types/react-widgets/lib/NumberPicker.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonProps} from './CommonProps';
+import { ReactWidgetsCommonProps } from './CommonProps';
 
 interface NumberPickerProps extends ReactWidgetsCommonProps<NumberPickerClass>{
     /**
diff --git a/types/react-widgets/lib/SelectList.d.ts b/types/react-widgets/lib/SelectList.d.ts
index ca925898c6..a70f4c4de8 100644
--- a/types/react-widgets/lib/SelectList.d.ts
+++ b/types/react-widgets/lib/SelectList.d.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {ReactWidgetsCommonProps} from './CommonProps';
+import { ReactWidgetsCommonProps } from './CommonProps';
 
 interface SelectListProps extends ReactWidgetsCommonProps<SelectListClass>{
     /**
diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index 8d76f3084c..e29d62cb0d 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 export interface UncontrolledProps {
   className?: string;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index 4f88f48025..51f72e39d3 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   color?: string;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index e66c672a64..54f581288c 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: string;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index 66e56776be..0277305b21 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index c0181c6374..be4d1c50d6 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLButtonElement> {
   outline?: boolean;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index ddabdb88d1..d807ea33cf 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index 3a33287f14..fea31dd5d5 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 28acb6cbaf..0dbde7f879 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardBlock.d.ts b/types/reactstrap/lib/CardBlock.d.ts
index 6b93fcafce..0aa31a63a7 100644
--- a/types/reactstrap/lib/CardBlock.d.ts
+++ b/types/reactstrap/lib/CardBlock.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index 12c0507d5a..0cc1a80a1a 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index 6f3076577d..1a5882aa54 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index ab5434ae9c..0956cb06c9 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index d258e08615..5c0a0a1ab1 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index 01e60e345d..f063057c92 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index 6fa732ebca..1c3fee274b 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index 0d366bc396..05519847b2 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 6c759033d7..62efc4efc6 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index 923339aecd..bfacd4e794 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index effb2b81ad..13177fba67 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 61199b455c..2843800a4e 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index d072e8fb46..50160bbcf6 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLElement> {
   isOpen?: boolean;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index a7e02b2a72..f49951ba26 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 7ad85570b1..19d1500cbe 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -1,6 +1,6 @@
 /// <reference types='tether' />
 
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 export interface UncontrolledProps {
   isOpen?: boolean;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index 46462984e0..6fae837041 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   disabled?: boolean;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index e0a01f109d..05e93babef 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index ac72251641..5ef49db71f 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   caret?: boolean;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 3bac4061a7..30862d2e17 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   baseClass?: string;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index d3a4497d0e..1c10cfe54a 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLFormElement> {
   inline?: boolean;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index 3e30e323a3..7fde21b062 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: string;
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index 800ce4ceb1..6031ff2f75 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLDivElement> {
   row?: boolean;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index 6bc2351582..9069be4da6 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   inline?: boolean;
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 6177ccfce5..38a83a49f6 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 type InputType =
   | 'text'
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 40bba65097..2de95edc94 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index 07a4512809..a98eb5d821 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/InputGroupButton.d.ts b/types/reactstrap/lib/InputGroupButton.d.ts
index 304eb660e0..fa7cb1995a 100644
--- a/types/reactstrap/lib/InputGroupButton.d.ts
+++ b/types/reactstrap/lib/InputGroupButton.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index 70f0919b7f..cc1f65c956 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index ab7dd820d3..eb496d90a3 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 import { ColumnProps } from './Col';
 
 interface Intermediate extends React.LabelHTMLAttributes<HTMLLabelElement> {
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index 4cb380922f..861c7a1d06 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index f7238ce2eb..9627f3262b 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index c8168682ab..869a6b2708 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index 394e524c3d..df263f30d8 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index 6f11450323..c5408d85d7 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   body?: boolean;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index 06261e0ac1..8ba3ef21d2 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   isOpen?: boolean;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index a32793459e..98933b2fc2 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index ad50921f92..84b3da7ec8 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index 73c95eae3e..494c9685a3 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index 72792c29aa..c646e94304 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLUListElement> {
   inline?: boolean;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index ced648169d..db19f92c56 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index e9a7ea1ef8..0c90c104bb 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 0e187426d8..f3e57535e7 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   light?: boolean;
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index 6af6777533..94239da4f8 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface NavbarBrand {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index 4372607830..282eeaa672 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLAnchorElement> {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 1a7eecb356..a34401be35 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   className?: string;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index 69f9f0e286..183a7e9d84 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   className?: string;
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index e3429ceb7b..16e194578d 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps<HTMLAnchorElement> {
   'aria-label'?: string;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index 50d3bbd5fc..b779a33ede 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -1,6 +1,6 @@
 /// <reference types='tether' />
 
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 type Placement
   = 'top'
diff --git a/types/reactstrap/lib/PopoverContent.d.ts b/types/reactstrap/lib/PopoverContent.d.ts
index 9104824756..cac45d14cb 100644
--- a/types/reactstrap/lib/PopoverContent.d.ts
+++ b/types/reactstrap/lib/PopoverContent.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/PopoverTitle.d.ts b/types/reactstrap/lib/PopoverTitle.d.ts
index ea1a01f415..796de02658 100644
--- a/types/reactstrap/lib/PopoverTitle.d.ts
+++ b/types/reactstrap/lib/PopoverTitle.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index b8b683f5ae..09c4304373 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   bar?: boolean;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index 5b52a3fb71..1ffbb9f7e6 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props extends React.HTMLProps< HTMLElement> {
   className?: string;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index 69fe513818..af6feec078 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index d53961d5ff..9eead420be 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   tag?: React.ReactType;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index 970282dd9b..ec8bfc43fd 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   className?: string;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index b3c7ca77ff..7dce8876f2 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -1,4 +1,4 @@
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   color?: string;
diff --git a/types/reactstrap/lib/TetherContent.d.ts b/types/reactstrap/lib/TetherContent.d.ts
index e372a77f07..cbc22373e3 100644
--- a/types/reactstrap/lib/TetherContent.d.ts
+++ b/types/reactstrap/lib/TetherContent.d.ts
@@ -1,6 +1,6 @@
 /// <reference types='tether' />
 
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 interface Props {
   className?: string;
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index df8987e36d..9dba615084 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -1,6 +1,6 @@
 /// <reference types='tether' />
 
-import {CSSModule} from '../index';
+import { CSSModule } from '../index';
 
 type Placement
   = 'top'
diff --git a/types/redlock/redlock-tests.ts b/types/redlock/redlock-tests.ts
index 311103ad2d..3b2c8f25f7 100644
--- a/types/redlock/redlock-tests.ts
+++ b/types/redlock/redlock-tests.ts
@@ -1,7 +1,7 @@
 import * as Redlock from 'redlock';
 import { Callback as NodeifyCallback, Options, Lock } from 'redlock';
 import * as Promise from 'bluebird';
-import {RedisClient} from 'redis';
+import { RedisClient } from 'redis';
 
 let redlock: Redlock;
 let client: RedisClient;
diff --git a/types/reduce-reducers/index.d.ts b/types/reduce-reducers/index.d.ts
index 2b630766fc..d4bde0bc8a 100644
--- a/types/reduce-reducers/index.d.ts
+++ b/types/reduce-reducers/index.d.ts
@@ -3,5 +3,5 @@
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {Reducer} from 'redux';
+import { Reducer } from 'redux';
 export default function reduceReducer<S>(...reducers: Array<Reducer<S>>): Reducer<S>;
diff --git a/types/redux-devtools-log-monitor/index.d.ts b/types/redux-devtools-log-monitor/index.d.ts
index d3cc1b25a6..b257adec0f 100644
--- a/types/redux-devtools-log-monitor/index.d.ts
+++ b/types/redux-devtools-log-monitor/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.3
 
 import * as React from 'react'
-import {ColorScheme} from 'base16'
+import { ColorScheme } from 'base16'
 
 interface ILogMonitorProps {
     /**
diff --git a/types/redux-form/v4/redux-form-tests.tsx b/types/redux-form/v4/redux-form-tests.tsx
index 2c962460fa..424c87c609 100644
--- a/types/redux-form/v4/redux-form-tests.tsx
+++ b/types/redux-form/v4/redux-form-tests.tsx
@@ -1,6 +1,6 @@
 
 import * as React from 'react';
-import {Component, PropTypes} from 'react';
+import { Component, PropTypes } from 'react';
 import {createStore, combineReducers} from 'redux';
 import {reduxForm, reducer as reduxFormReducer, ReduxFormProps} from 'redux-form';
 
diff --git a/types/redux-logger/redux-logger-tests.ts b/types/redux-logger/redux-logger-tests.ts
index db0131b95e..3ede2b8806 100644
--- a/types/redux-logger/redux-logger-tests.ts
+++ b/types/redux-logger/redux-logger-tests.ts
@@ -1,5 +1,5 @@
 
-import {createLogger} from 'redux-logger';
+import { createLogger } from 'redux-logger';
 import logger from 'redux-logger';
 import { applyMiddleware, createStore } from 'redux';
 
diff --git a/types/redux-promise/redux-promise-tests.ts b/types/redux-promise/redux-promise-tests.ts
index 39f3c9fe84..1305cd6833 100644
--- a/types/redux-promise/redux-promise-tests.ts
+++ b/types/redux-promise/redux-promise-tests.ts
@@ -1,4 +1,4 @@
-import {createAction} from 'redux-actions';
+import { createAction } from 'redux-actions';
 import { createStore, applyMiddleware, PromiseAction } from 'redux';
 import promise = require('redux-promise');
 
diff --git a/types/restangular/index.d.ts b/types/restangular/index.d.ts
index 5d871cdd67..c32f913549 100644
--- a/types/restangular/index.d.ts
+++ b/types/restangular/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="angular" />
 
 // Support AMD require (copying angular.d.ts approach)
-// allows for import {IRequestConfig} from 'restangular' ES6 approach
+// allows for import { IRequestConfig } from 'restangular' ES6 approach
 import * as angular from 'angular';
 export = restangular;
 export as namespace Restangular;
diff --git a/types/restify-plugins/index.d.ts b/types/restify-plugins/index.d.ts
index d461358bdc..c0d8114d92 100644
--- a/types/restify-plugins/index.d.ts
+++ b/types/restify-plugins/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Костя Третяк <https://github.com/KostyaTretyak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import {RequestHandler, Server, Request, Response, Route} from 'restify';
+import { RequestHandler, Server, Request, Response, Route } from 'restify';
 import Logger = require('bunyan');
 
 // *************** This module includes the follow pre plugins, which are intended to be used prior to the routing of a request:
diff --git a/types/rheostat/rheostat-tests.tsx b/types/rheostat/rheostat-tests.tsx
index 1116861943..263e287f6f 100644
--- a/types/rheostat/rheostat-tests.tsx
+++ b/types/rheostat/rheostat-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import Rheostat, {Orientation, Algorithm, PublicState} from 'rheostat';
+import Rheostat, { Orientation, Algorithm, PublicState } from 'rheostat';
 
 type Element = React.ReactElement<any>;
 
diff --git a/types/router5/router5-tests.ts b/types/router5/router5-tests.ts
index 3e94724f54..e59f6830c8 100644
--- a/types/router5/router5-tests.ts
+++ b/types/router5/router5-tests.ts
@@ -1,5 +1,5 @@
 
-import Router5, {loggerPlugin, RouteNode, Router5 as _Router5} from 'router5';
+import Router5, {loggerPlugin, RouteNode, Router5 as _Router5 } from 'router5';
 
 const router1: Router5 = new Router5();
 const router2: Router5 = new _Router5();
diff --git a/types/rx.wamp/rx.wamp-tests.ts b/types/rx.wamp/rx.wamp-tests.ts
index 16c036f0a3..6e7cb3e6ed 100644
--- a/types/rx.wamp/rx.wamp-tests.ts
+++ b/types/rx.wamp/rx.wamp-tests.ts
@@ -1,5 +1,5 @@
 import * as autobahn from "autobahn";
-import {IWampEvent} from "rx.wamp";
+import { IWampEvent } from "rx.wamp";
 
 function nodeJS(session: autobahn.Session) {
     var sessionObservable =
diff --git a/types/scalike/scalike-tests.ts b/types/scalike/scalike-tests.ts
index f95bb91a9c..6f393baf77 100644
--- a/types/scalike/scalike-tests.ts
+++ b/types/scalike/scalike-tests.ts
@@ -1,6 +1,6 @@
 
 
-import {Optional, Some, None, Try, Right, Left, Either, Future} from "scalike";
+import { Optional, Some, None, Try, Right, Left, Either, Future } from "scalike";
 
 // Optional
 Optional(1).map(x => x + 1); // Some(2)
diff --git a/types/sinon-express-mock/sinon-express-mock-tests.ts b/types/sinon-express-mock/sinon-express-mock-tests.ts
index 8e5c61a6b9..c48259b22d 100644
--- a/types/sinon-express-mock/sinon-express-mock-tests.ts
+++ b/types/sinon-express-mock/sinon-express-mock-tests.ts
@@ -1,5 +1,5 @@
 import * as Sinon from "sinon";
-import {mockReq, mockRes} from "sinon-express-mock";
+import { mockReq, mockRes } from "sinon-express-mock";
 
 const req = mockReq({});
 const acceptStub: Sinon.SinonStub = req.accepts();
diff --git a/types/stream-meter/index.d.ts b/types/stream-meter/index.d.ts
index 37d5f315c6..ed095c6320 100644
--- a/types/stream-meter/index.d.ts
+++ b/types/stream-meter/index.d.ts
@@ -5,7 +5,7 @@
 /// <reference types="node" />
 
 
-import {Transform} from 'stream';
+import { Transform } from 'stream';
 
 declare function m(maxBytes?: number): m.StreamMeter;
 
diff --git a/types/supercluster/supercluster-tests.ts b/types/supercluster/supercluster-tests.ts
index 267d2df4fd..36993be0c2 100644
--- a/types/supercluster/supercluster-tests.ts
+++ b/types/supercluster/supercluster-tests.ts
@@ -1,5 +1,5 @@
 import * as supercluster from 'supercluster';
-import {Point} from 'supercluster';
+import { Point } from 'supercluster';
 
 const point1: Point = {
     type: 'Feature',
diff --git a/types/swagger-express-middleware/index.d.ts b/types/swagger-express-middleware/index.d.ts
index a782fee0d1..f6449f8485 100644
--- a/types/swagger-express-middleware/index.d.ts
+++ b/types/swagger-express-middleware/index.d.ts
@@ -29,7 +29,7 @@ app.listen(8000, function () {
 /// <reference types="express" />
 
 declare module "swagger-express-middleware" {
-    import {Application, Router, RequestHandler, Request, Response} from "express";
+    import { Application, Router, RequestHandler, Request, Response } from "express";
 
     let s: s.SwaggerMiddlewareConstructor;
 
diff --git a/types/swagger-parser/swagger-parser-tests.ts b/types/swagger-parser/swagger-parser-tests.ts
index f880c801b2..2fee32a9fa 100644
--- a/types/swagger-parser/swagger-parser-tests.ts
+++ b/types/swagger-parser/swagger-parser-tests.ts
@@ -1,5 +1,5 @@
 import parser = require("swagger-parser");
-import { Spec as Swagger } from '../swagger-schema-official';
+import { Spec as Swagger } from "swagger-schema-official";
 
 const swaggerMock: Swagger = {
     swagger: '',
@@ -8,7 +8,7 @@ const swaggerMock: Swagger = {
         version: ''
     },
     paths: { '': {} }
-}
+};
 
 // Without callback which returns a promise
 parser.parse("test.yaml").then((file) => {
diff --git a/types/switchery/switchery-tests.ts b/types/switchery/switchery-tests.ts
index b1894ef2db..56a637fc50 100644
--- a/types/switchery/switchery-tests.ts
+++ b/types/switchery/switchery-tests.ts
@@ -1,7 +1,7 @@
 //
 // Examples from https://github.com/abpetkov/switchery
 //
-import {default as Switchery} from "switchery";
+import { default as Switchery } from "switchery";
 
 function multipleSwitches() {
 
diff --git a/types/three/three-ddsloader.d.ts b/types/three/three-ddsloader.d.ts
index 8d8f85bd0e..0eff951f82 100644
--- a/types/three/three-ddsloader.d.ts
+++ b/types/three/three-ddsloader.d.ts
@@ -1,6 +1,6 @@
 // https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/DDSLoader.js
 
-import {CompressedPixelFormat, CompressedTextureLoader} from "./three-core";
+import { CompressedPixelFormat, CompressedTextureLoader } from "./three-core";
 
 export interface Dds {
   mipmaps: ImageData[],
diff --git a/types/three/three-examples.d.ts b/types/three/three-examples.d.ts
index 67efcc566a..c08773fdf4 100644
--- a/types/three/three-examples.d.ts
+++ b/types/three/three-examples.d.ts
@@ -1,6 +1,6 @@
 // Things from three.js/examples/ that do not (yet) have their own file
 
-import {EventDispatcher, Shader} from "./three-core";
+import { EventDispatcher, Shader } from "./three-core";
 
 export var AWDLoader: any;
 export var OBJLoader2: any;
diff --git a/types/three/three-fbxloader.d.ts b/types/three/three-fbxloader.d.ts
index 7a77ea67f5..5175a6683f 100644
--- a/types/three/three-fbxloader.d.ts
+++ b/types/three/three-fbxloader.d.ts
@@ -1,6 +1,6 @@
 // https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/FBXLoader.js
 
-import {LoadingManager} from "./three-core";
+import { LoadingManager } from "./three-core";
 import {Group} from "./three-core";
 
 export class FBXLoader {
diff --git a/types/three/three-mtlloader.d.ts b/types/three/three-mtlloader.d.ts
index dce5b12a17..33b4822432 100644
--- a/types/three/three-mtlloader.d.ts
+++ b/types/three/three-mtlloader.d.ts
@@ -1,7 +1,7 @@
 // https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/MTLLoader.js
 
 
-import {Material} from "./three-core";
+import { Material } from "./three-core";
 import {LoadingManager} from "./three-core";
 import {EventDispatcher} from "./three-core";
 import {BufferGeometry} from "./three-core";
diff --git a/types/three/three-objloader.d.ts b/types/three/three-objloader.d.ts
index 62403eeebb..8fd32c1e69 100644
--- a/types/three/three-objloader.d.ts
+++ b/types/three/three-objloader.d.ts
@@ -1,6 +1,6 @@
 // https://github.com/mrdoob/three.js/blob/master/examples/js/loaders/OBJLoader.js
 
-import {Material} from "./three-core";
+import { Material } from "./three-core";
 import {LoadingManager} from "./three-core";
 import {Group} from "./three-core";
 import {MaterialCreator} from "./three-mtlloader";
diff --git a/types/universal-router/universal-router-tests.ts b/types/universal-router/universal-router-tests.ts
index 1d20af187e..ea6853e2cf 100644
--- a/types/universal-router/universal-router-tests.ts
+++ b/types/universal-router/universal-router-tests.ts
@@ -1,4 +1,4 @@
-import {ActionContext, Params, resolve } from "universal-router";
+import { ActionContext, Params, resolve } from "universal-router";
 
 // Test 1
 const routes1 = [
diff --git a/types/uws/uws-tests.ts b/types/uws/uws-tests.ts
index 5d0b2ed3c6..76b60f335a 100644
--- a/types/uws/uws-tests.ts
+++ b/types/uws/uws-tests.ts
@@ -1,5 +1,5 @@
 import * as WebSocket from 'uws';
-import {Buffer} from 'buffer';
+import { Buffer } from 'buffer';
 import * as http from'http';
 import * as https from'https';
 import * as fs from'fs';
diff --git a/types/vec3/vec3-tests.ts b/types/vec3/vec3-tests.ts
index e3bd46c4be..2a9c13adc9 100644
--- a/types/vec3/vec3-tests.ts
+++ b/types/vec3/vec3-tests.ts
@@ -1,3 +1,3 @@
-import {Vec3} from "vec3";
+import { Vec3 } from "vec3";
 let myVector: Vec3 = new Vec3(10, 10, 10);
 console.log(myVector.toString());
\ No newline at end of file
diff --git a/types/viewability-helper/viewability-helper-tests.ts b/types/viewability-helper/viewability-helper-tests.ts
index b8b43102b4..cd2548f001 100644
--- a/types/viewability-helper/viewability-helper-tests.ts
+++ b/types/viewability-helper/viewability-helper-tests.ts
@@ -1,6 +1,6 @@
 // Tests for ViewabilityHelper API
 
-import {ViewabilityHelper, Options} from 'viewability-helper';
+import { ViewabilityHelper, Options } from 'viewability-helper';
 
 let d: Element = document.createElement('DIV');
 let vh: ViewabilityHelper = new ViewabilityHelper(d, () => {});
diff --git a/types/webpack-fail-plugin/index.d.ts b/types/webpack-fail-plugin/index.d.ts
index d0436a3b89..04f037e084 100644
--- a/types/webpack-fail-plugin/index.d.ts
+++ b/types/webpack-fail-plugin/index.d.ts
@@ -6,7 +6,7 @@
 ///<reference types="webpack" />
 
 declare module "webpack-fail-plugin" {
-    import {Plugin} from "webpack";
+    import { Plugin } from "webpack";
 
     /**
      * Webpack plugin that will make the process return status code 1 when it finishes with errors in single-run mode.
diff --git a/types/webpack-merge/index.d.ts b/types/webpack-merge/index.d.ts
index 18aaca1f36..a939a2ed53 100644
--- a/types/webpack-merge/index.d.ts
+++ b/types/webpack-merge/index.d.ts
@@ -6,7 +6,7 @@
 ///<reference types="webpack" />
 
 declare module "webpack-merge" {
-    import {Configuration} from "webpack";
+    import { Configuration } from "webpack";
 
     interface WebpackMerge {
         /**
diff --git a/types/webpack-merge/webpack-merge-tests.ts b/types/webpack-merge/webpack-merge-tests.ts
index bc40806a23..4c9c4adca4 100644
--- a/types/webpack-merge/webpack-merge-tests.ts
+++ b/types/webpack-merge/webpack-merge-tests.ts
@@ -1,5 +1,5 @@
 import merge = require("webpack-merge");
-import {Configuration} from "webpack";
+import { Configuration } from "webpack";
 
 const a: Configuration = {
     entry: "test.js"
diff --git a/types/webpack-validator/index.d.ts b/types/webpack-validator/index.d.ts
index 850aadd654..4b6b260877 100644
--- a/types/webpack-validator/index.d.ts
+++ b/types/webpack-validator/index.d.ts
@@ -6,7 +6,7 @@
 ///<reference types="webpack" />
 
 declare module "webpack-validator" {
-    import {Configuration} from "webpack";
+    import { Configuration } from "webpack";
 
     interface ValidationOptions {
         "no-root-files-node-modules-nameclash"?: boolean;
diff --git a/types/webpack-validator/webpack-validator-tests.ts b/types/webpack-validator/webpack-validator-tests.ts
index 9635ae2060..5cb729b720 100644
--- a/types/webpack-validator/webpack-validator-tests.ts
+++ b/types/webpack-validator/webpack-validator-tests.ts
@@ -1,4 +1,4 @@
-import {Configuration} from "webpack";
+import { Configuration } from "webpack";
 import validate = require("webpack-validator");
 
 const a: Configuration = {
diff --git a/types/why-did-you-update/why-did-you-update-tests.ts b/types/why-did-you-update/why-did-you-update-tests.ts
index d628e796c6..71aade524e 100644
--- a/types/why-did-you-update/why-did-you-update-tests.ts
+++ b/types/why-did-you-update/why-did-you-update-tests.ts
@@ -1,5 +1,5 @@
 import * as React from "react";
-import {whyDidYouUpdate} from "why-did-you-update";
+import { whyDidYouUpdate } from "why-did-you-update";
 
 whyDidYouUpdate(React);
 whyDidYouUpdate(React, { include: /^pure/, exclude: /^Connect/ });
diff --git a/types/winston/index.d.ts b/types/winston/index.d.ts
index a189f03c22..a00c89a5b6 100644
--- a/types/winston/index.d.ts
+++ b/types/winston/index.d.ts
@@ -7,7 +7,7 @@
 
 /// <reference types="node" />
 
-import {Agent} from 'http';
+import { Agent } from 'http';
 
 declare namespace winston {
     interface AbstractConfigSetLevels {
diff --git a/types/wonder-commonlib/wonder-commonlib-tests.ts b/types/wonder-commonlib/wonder-commonlib-tests.ts
index 852f768f01..602be32a6b 100644
--- a/types/wonder-commonlib/wonder-commonlib-tests.ts
+++ b/types/wonder-commonlib/wonder-commonlib-tests.ts
@@ -1,4 +1,4 @@
-import {Collection} from "wonder-commonlib/dist/es2015/Collection";
+import { Collection } from "wonder-commonlib/dist/es2015/Collection";
 
 var list = Collection.create();
 
diff --git a/types/wonder-frp/wonder-frp-tests.ts b/types/wonder-frp/wonder-frp-tests.ts
index ef7ea2672b..66387b193e 100644
--- a/types/wonder-frp/wonder-frp-tests.ts
+++ b/types/wonder-frp/wonder-frp-tests.ts
@@ -1,4 +1,4 @@
-import {fromArray} from "wonder-frp/dist/es2015/global/Operator";
+import { fromArray } from "wonder-frp/dist/es2015/global/Operator";
 
 fromArray([1,2,3])
     .subscribe(function(){
diff --git a/types/wonder.js/wonder.js-tests.ts b/types/wonder.js/wonder.js-tests.ts
index eb486e6a48..7ad6abc4bc 100644
--- a/types/wonder.js/wonder.js-tests.ts
+++ b/types/wonder.js/wonder.js-tests.ts
@@ -1,4 +1,4 @@
-import {Director} from "wonder.js/dist/es2015/core/Director";
+import { Director } from "wonder.js/dist/es2015/core/Director";
 
 console.log(Director.getInstance());
 
diff --git a/types/xmpp__jid/xmpp__jid-tests.ts b/types/xmpp__jid/xmpp__jid-tests.ts
index 1652e054a7..d26ede9a15 100644
--- a/types/xmpp__jid/xmpp__jid-tests.ts
+++ b/types/xmpp__jid/xmpp__jid-tests.ts
@@ -1,4 +1,4 @@
-import {JID} from '@xmpp/jid';
+import { JID } from '@xmpp/jid';
 
 /*
  * All return an instance of JID.JID, the new operator is optional.
diff --git a/types/yeoman-test/index.d.ts b/types/yeoman-test/index.d.ts
index 8d3c79ed22..9106df49c4 100644
--- a/types/yeoman-test/index.d.ts
+++ b/types/yeoman-test/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-import {EventEmitter} from 'events';
+import { EventEmitter } from 'events';
 import Generator = require('yeoman-generator');
 
 export interface Dictionary<T> {