diff --git a/app/scripts/app.js b/app/scripts/app.js
index d94a92ce..9a13179f 100644
--- a/app/scripts/app.js
+++ b/app/scripts/app.js
@@ -1,28 +1,30 @@
-const Backbone = require('backbone');
-const AppModel = require('./models/app-model');
-const AppView = require('./views/app-view');
-const AppSettingsModel = require('./models/app-settings-model');
-const UpdateModel = require('./models/update-model');
-const RuntimeDataModel = require('./models/runtime-data-model');
-const FileInfoCollection = require('./collections/file-info-collection');
-const KeyHandler = require('./comp/browser/key-handler');
-const IdleTracker = require('./comp/browser/idle-tracker');
-const PopupNotifier = require('./comp/browser/popup-notifier');
-const SingleInstanceChecker = require('./comp/app/single-instance-checker');
-const AppRightsChecker = require('./comp/app/app-rights-checker');
-const Alerts = require('./comp/ui/alerts');
-const Updater = require('./comp/app/updater');
-const AuthReceiver = require('./comp/browser/auth-receiver');
-const ExportApi = require('./comp/app/export-api');
-const SettingsManager = require('./comp/settings/settings-manager');
-const PluginManager = require('./plugins/plugin-manager');
-const Launcher = require('./comp/launcher');
-const FeatureTester = require('./comp/browser/feature-tester');
-const FocusDetector = require('./comp/browser/focus-detector');
-const Timeouts = require('./const/timeouts');
-const Features = require('./util/features');
-const KdbxwebInit = require('./util/kdbxweb/kdbxweb-init');
-const Locale = require('./util/locale');
+import Backbone from 'backbone';
+import { FileInfoCollection } from 'collections/file-info-collection';
+import { AppRightsChecker } from 'comp/app/app-rights-checker';
+import { ExportApi } from 'comp/app/export-api';
+import { SingleInstanceChecker } from 'comp/app/single-instance-checker';
+import { Updater } from 'comp/app/updater';
+import { AuthReceiver } from 'comp/browser/auth-receiver';
+import { FeatureTester } from 'comp/browser/feature-tester';
+import { FocusDetector } from 'comp/browser/focus-detector';
+import { IdleTracker } from 'comp/browser/idle-tracker';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { PopupNotifier } from 'comp/browser/popup-notifier';
+import { Launcher } from 'comp/launcher';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { Alerts } from 'comp/ui/alerts';
+import { Timeouts } from 'const/timeouts';
+import { AppModel } from 'models/app-model';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { RuntimeDataModel } from 'models/runtime-data-model';
+import { UpdateModel } from 'models/update-model';
+import { PluginManager } from 'plugins/plugin-manager';
+import { Features } from 'util/features';
+import { KdbxwebInit } from 'util/kdbxweb/kdbxweb-init';
+import { Locale } from 'util/locale';
+import { AppView } from 'views/app-view';
+import 'view-engine/backbone-view-ext';
+import 'hbs-helpers';
 
 const ready = (Launcher && Launcher.ready) || $;
 
@@ -30,7 +32,6 @@ ready(() => {
     if (AuthReceiver.receive() || Features.isFrame) {
         return;
     }
-    loadMixins();
 
     const appModel = new AppModel();
 
@@ -45,11 +46,6 @@ ready(() => {
             appModel.appLogger.error('Error starting app', e);
         });
 
-    function loadMixins() {
-        require('./view-engine/backbone-view-ext');
-        require('./hbs-helpers');
-    }
-
     function ensureCanRun() {
         return FeatureTester.test().catch(e => {
             Alerts.error({
@@ -146,7 +142,10 @@ ready(() => {
         Updater.init();
         SingleInstanceChecker.init();
         AppRightsChecker.init();
-        setTimeout(() => PluginManager.instance.runAutoUpdate(), Timeouts.AutoUpdatePluginsAfterStart);
+        setTimeout(
+            () => PluginManager.instance.runAutoUpdate(),
+            Timeouts.AutoUpdatePluginsAfterStart
+        );
     }
 
     function showView() {
diff --git a/app/scripts/auto-type/auto-type-emitter-factory.js b/app/scripts/auto-type/auto-type-emitter-factory.js
index fa856e3f..21f4057a 100644
--- a/app/scripts/auto-type/auto-type-emitter-factory.js
+++ b/app/scripts/auto-type/auto-type-emitter-factory.js
@@ -1,13 +1,14 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeEmitterFactory = {
     create(callback) {
         if (Launcher && Launcher.autoTypeSupported) {
-            const AutoTypeEmitter = require('./emitter/auto-type-emitter-' + Launcher.platform());
+            const { AutoTypeEmitter } = require('./emitter/auto-type-emitter-' +
+                Launcher.platform());
             return new AutoTypeEmitter(callback);
         }
         return null;
     }
 };
 
-module.exports = AutoTypeEmitterFactory;
+export { AutoTypeEmitterFactory };
diff --git a/app/scripts/auto-type/auto-type-filter.js b/app/scripts/auto-type/auto-type-filter.js
index 09953b80..458d91ad 100644
--- a/app/scripts/auto-type/auto-type-filter.js
+++ b/app/scripts/auto-type/auto-type-filter.js
@@ -1,5 +1,5 @@
-const EntryCollection = require('../collections/entry-collection');
-const Ranking = require('../util/data/ranking');
+import { EntryCollection } from 'collections/entry-collection';
+import { Ranking } from 'util/data/ranking';
 
 const urlPartsRegex = /^(\w+:\/\/)?(?:(?:www|wwws|secure)\.)?([^\/]+)\/?(.*)/;
 
@@ -87,4 +87,4 @@ AutoTypeFilter.prototype.getEntryRank = function(entry) {
     return rank;
 };
 
-module.exports = AutoTypeFilter;
+export { AutoTypeFilter };
diff --git a/app/scripts/auto-type/auto-type-helper-factory.js b/app/scripts/auto-type/auto-type-helper-factory.js
index 84e481df..a3b63e9f 100644
--- a/app/scripts/auto-type/auto-type-helper-factory.js
+++ b/app/scripts/auto-type/auto-type-helper-factory.js
@@ -1,13 +1,13 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeHelperFactory = {
     create() {
         if (Launcher && Launcher.autoTypeSupported) {
-            const AutoTypeHelper = require('./helper/auto-type-helper-' + Launcher.platform());
+            const { AutoTypeHelper } = require('./helper/auto-type-helper-' + Launcher.platform());
             return new AutoTypeHelper();
         }
         return null;
     }
 };
 
-module.exports = AutoTypeHelperFactory;
+export { AutoTypeHelperFactory };
diff --git a/app/scripts/auto-type/auto-type-obfuscator.js b/app/scripts/auto-type/auto-type-obfuscator.js
index 5494f362..2aca4d5a 100644
--- a/app/scripts/auto-type/auto-type-obfuscator.js
+++ b/app/scripts/auto-type/auto-type-obfuscator.js
@@ -1,4 +1,4 @@
-const Logger = require('../util/logger');
+import { Logger } from 'util/logger';
 
 const logger = new Logger('auto-type-obfuscator');
 logger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn);
@@ -203,4 +203,4 @@ AutoTypeObfuscator.prototype.deleteText = function(backward) {
     }
 };
 
-module.exports = AutoTypeObfuscator;
+export { AutoTypeObfuscator };
diff --git a/app/scripts/auto-type/auto-type-parser.js b/app/scripts/auto-type/auto-type-parser.js
index e8704dc8..c7e98cb3 100644
--- a/app/scripts/auto-type/auto-type-parser.js
+++ b/app/scripts/auto-type/auto-type-parser.js
@@ -1,4 +1,4 @@
-const AutoTypeRunner = require('./auto-type-runner');
+import { AutoTypeRunner } from 'auto-type/auto-type-runner';
 
 const AutoTypeParser = function(sequence) {
     this.sequence = sequence;
@@ -124,4 +124,4 @@ AutoTypeParser.prototype.addOp = function(op, sep, arg) {
     });
 };
 
-module.exports = AutoTypeParser;
+export { AutoTypeParser };
diff --git a/app/scripts/auto-type/auto-type-runner.js b/app/scripts/auto-type/auto-type-runner.js
index fbc81bd0..a6cf1abc 100644
--- a/app/scripts/auto-type/auto-type-runner.js
+++ b/app/scripts/auto-type/auto-type-runner.js
@@ -1,7 +1,7 @@
-const AutoTypeObfuscator = require('./auto-type-obfuscator');
-const AutoTypeEmitterFactory = require('./auto-type-emitter-factory');
-const StringFormat = require('../util/formatting/string-format');
-const Logger = require('../util/logger');
+import { AutoTypeEmitterFactory } from 'auto-type/auto-type-emitter-factory';
+import { AutoTypeObfuscator } from 'auto-type/auto-type-obfuscator';
+import { StringFormat } from 'util/formatting/string-format';
+import { Logger } from 'util/logger';
 
 const emitterLogger = new Logger('auto-type-emitter');
 emitterLogger.setLevel(localStorage.autoTypeDebug ? Logger.Level.All : Logger.Level.Warn);
@@ -529,4 +529,4 @@ AutoTypeRunner.prototype.resetEmitterMod = function(targetState) {
     }, this);
 };
 
-module.exports = AutoTypeRunner;
+export { AutoTypeRunner };
diff --git a/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js b/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js
index fdabd8b0..0819d24b 100644
--- a/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js
+++ b/app/scripts/auto-type/emitter/auto-type-emitter-darwin.js
@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const AutoTypeNativeHelper = require('../helper/auto-type-native-helper');
+import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
+import { Launcher } from 'comp/launcher';
 
 // http://eastmanreference.com/complete-list-of-applescript-key-codes/
 const KeyMap = {
@@ -126,4 +126,4 @@ AutoTypeEmitter.prototype.runScript = function(script) {
     });
 };
 
-module.exports = AutoTypeEmitter;
+export { AutoTypeEmitter };
diff --git a/app/scripts/auto-type/emitter/auto-type-emitter-linux.js b/app/scripts/auto-type/emitter/auto-type-emitter-linux.js
index 3ebe1967..10c65e04 100644
--- a/app/scripts/auto-type/emitter/auto-type-emitter-linux.js
+++ b/app/scripts/auto-type/emitter/auto-type-emitter-linux.js
@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const Locale = require('../../util/locale');
+import { Launcher } from 'comp/launcher';
+import { Locale } from 'util/locale';
 
 // https://cgit.freedesktop.org/xorg/proto/x11proto/plain/keysymdef.h
 const KeyMap = {
@@ -144,4 +144,4 @@ AutoTypeEmitter.prototype.runScript = function(script, callback) {
     });
 };
 
-module.exports = AutoTypeEmitter;
+export { AutoTypeEmitter };
diff --git a/app/scripts/auto-type/emitter/auto-type-emitter-win32.js b/app/scripts/auto-type/emitter/auto-type-emitter-win32.js
index 49bb7dfe..f53ec1a6 100644
--- a/app/scripts/auto-type/emitter/auto-type-emitter-win32.js
+++ b/app/scripts/auto-type/emitter/auto-type-emitter-win32.js
@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const AutoTypeNativeHelper = require('../helper/auto-type-native-helper');
+import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
+import { Launcher } from 'comp/launcher';
 
 // https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
 const KeyMap = {
@@ -128,4 +128,4 @@ AutoTypeEmitter.prototype.runScript = function(script) {
     });
 };
 
-module.exports = AutoTypeEmitter;
+export { AutoTypeEmitter };
diff --git a/app/scripts/auto-type/helper/auto-type-helper-darwin.js b/app/scripts/auto-type/helper/auto-type-helper-darwin.js
index 75ab5079..b26baa6c 100644
--- a/app/scripts/auto-type/helper/auto-type-helper-darwin.js
+++ b/app/scripts/auto-type/helper/auto-type-helper-darwin.js
@@ -1,4 +1,4 @@
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const ForeMostAppScript =
     'tell application "System Events"\n' +
@@ -89,4 +89,4 @@ AutoTypeHelper.exec = function(script, callback) {
     });
 };
 
-module.exports = AutoTypeHelper;
+export { AutoTypeHelper };
diff --git a/app/scripts/auto-type/helper/auto-type-helper-linux.js b/app/scripts/auto-type/helper/auto-type-helper-linux.js
index 19d3877b..4534dd52 100644
--- a/app/scripts/auto-type/helper/auto-type-helper-linux.js
+++ b/app/scripts/auto-type/helper/auto-type-helper-linux.js
@@ -1,4 +1,4 @@
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeHelper = function() {};
 
@@ -20,4 +20,4 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
     });
 };
 
-module.exports = AutoTypeHelper;
+export { AutoTypeHelper };
diff --git a/app/scripts/auto-type/helper/auto-type-helper-win32.js b/app/scripts/auto-type/helper/auto-type-helper-win32.js
index 44d03b0b..03dab0e9 100644
--- a/app/scripts/auto-type/helper/auto-type-helper-win32.js
+++ b/app/scripts/auto-type/helper/auto-type-helper-win32.js
@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const AutoTypeNativeHelper = require('./auto-type-native-helper');
+import { AutoTypeNativeHelper } from 'auto-type/helper/auto-type-native-helper';
+import { Launcher } from 'comp/launcher';
 
 const AutoTypeHelper = function() {};
 
@@ -22,4 +22,4 @@ AutoTypeHelper.prototype.getActiveWindowInfo = function(callback) {
     });
 };
 
-module.exports = AutoTypeHelper;
+export { AutoTypeHelper };
diff --git a/app/scripts/auto-type/helper/auto-type-native-helper.js b/app/scripts/auto-type/helper/auto-type-native-helper.js
index 43ebb0d8..d8485029 100644
--- a/app/scripts/auto-type/helper/auto-type-native-helper.js
+++ b/app/scripts/auto-type/helper/auto-type-native-helper.js
@@ -1,5 +1,5 @@
-const Launcher = require('../../comp/launcher');
-const Logger = require('../../util/logger');
+import { Launcher } from 'comp/launcher';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('auto-type');
 
@@ -18,4 +18,4 @@ const AutoTypeNativeHelper = {
     }
 };
 
-module.exports = AutoTypeNativeHelper;
+export { AutoTypeNativeHelper };
diff --git a/app/scripts/auto-type/index.js b/app/scripts/auto-type/index.js
index 2356e801..6f11fd47 100644
--- a/app/scripts/auto-type/index.js
+++ b/app/scripts/auto-type/index.js
@@ -1,14 +1,14 @@
-const Backbone = require('backbone');
-const AutoTypeParser = require('./auto-type-parser');
-const AutoTypeFilter = require('./auto-type-filter');
-const AutoTypeHelperFactory = require('./auto-type-helper-factory');
-const Launcher = require('../comp/launcher');
-const Alerts = require('../comp/ui/alerts');
-const AutoTypeSelectView = require('../views/auto-type/auto-type-select-view');
-const Logger = require('../util/logger');
-const Locale = require('../util/locale');
-const Timeouts = require('../const/timeouts');
-const AppSettingsModel = require('../models/app-settings-model');
+import Backbone from 'backbone';
+import { AutoTypeFilter } from 'auto-type/auto-type-filter';
+import { AutoTypeHelperFactory } from 'auto-type/auto-type-helper-factory';
+import { AutoTypeParser } from 'auto-type/auto-type-parser';
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { Timeouts } from 'const/timeouts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
+import { AutoTypeSelectView } from 'views/auto-type/auto-type-select-view';
 
 const logger = new Logger('auto-type');
 const clearTextAutoTypeLog = localStorage.autoTypeDebug;
@@ -282,4 +282,4 @@ const AutoType = {
     }
 };
 
-module.exports = AutoType;
+export { AutoType };
diff --git a/app/scripts/collections/entry-collection.js b/app/scripts/collections/entry-collection.js
index 2d84e4c6..f469de31 100644
--- a/app/scripts/collections/entry-collection.js
+++ b/app/scripts/collections/entry-collection.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const EntryModel = require('../models/entry-model');
-const Comparators = require('../util/data/comparators');
+import Backbone from 'backbone';
+import { EntryModel } from 'models/entry-model';
+import { Comparators } from 'util/data/comparators';
 
 const EntryCollection = Backbone.Collection.extend({
     model: EntryModel,
@@ -50,4 +50,4 @@ const EntryCollection = Backbone.Collection.extend({
     }
 });
 
-module.exports = EntryCollection;
+export { EntryCollection };
diff --git a/app/scripts/collections/file-collection.js b/app/scripts/collections/file-collection.js
index eb1ec6ea..2bbd0a14 100644
--- a/app/scripts/collections/file-collection.js
+++ b/app/scripts/collections/file-collection.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const FileModel = require('../models/file-model');
+import Backbone from 'backbone';
+import { FileModel } from 'models/file-model';
 
 const FileCollection = Backbone.Collection.extend({
     model: FileModel,
@@ -21,4 +21,4 @@ const FileCollection = Backbone.Collection.extend({
     }
 });
 
-module.exports = FileCollection;
+export { FileCollection };
diff --git a/app/scripts/collections/file-info-collection.js b/app/scripts/collections/file-info-collection.js
index 0a37af74..f1be6075 100644
--- a/app/scripts/collections/file-info-collection.js
+++ b/app/scripts/collections/file-info-collection.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const FileInfoModel = require('../models/file-info-model');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { FileInfoModel } from 'models/file-info-model';
 
 const FileInfoCollection = Backbone.Collection.extend({
     model: FileInfoModel,
@@ -40,4 +40,4 @@ const FileInfoCollection = Backbone.Collection.extend({
 
 FileInfoCollection.instance = new FileInfoCollection();
 
-module.exports = FileInfoCollection;
+export { FileInfoCollection };
diff --git a/app/scripts/collections/group-collection.js b/app/scripts/collections/group-collection.js
index dcb453d3..0c53d684 100644
--- a/app/scripts/collections/group-collection.js
+++ b/app/scripts/collections/group-collection.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const GroupModel = require('../models/group-model');
+import Backbone from 'backbone';
+import { GroupModel } from 'models/group-model';
 
 const GroupCollection = Backbone.Collection.extend({
     model: GroupModel
 });
 
-module.exports = GroupCollection;
+export { GroupCollection };
diff --git a/app/scripts/collections/menu/menu-item-collection.js b/app/scripts/collections/menu/menu-item-collection.js
index 4bf6db69..f24ee456 100644
--- a/app/scripts/collections/menu/menu-item-collection.js
+++ b/app/scripts/collections/menu/menu-item-collection.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuItemModel = require('../../models/menu/menu-item-model');
+import Backbone from 'backbone';
+import { MenuItemModel } from 'models/menu/menu-item-model';
 
 const MenuItemCollection = Backbone.Collection.extend({
     model: MenuItemModel
 });
 
-module.exports = MenuItemCollection;
+export { MenuItemCollection };
diff --git a/app/scripts/collections/menu/menu-option-collection.js b/app/scripts/collections/menu/menu-option-collection.js
index f37e7560..fef068bc 100644
--- a/app/scripts/collections/menu/menu-option-collection.js
+++ b/app/scripts/collections/menu/menu-option-collection.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuOptionModel = require('../../models/menu/menu-option-model');
+import Backbone from 'backbone';
+import { MenuOptionModel } from 'models/menu/menu-option-model';
 
 const MenuOptionCollection = Backbone.Collection.extend({
     model: MenuOptionModel
 });
 
-module.exports = MenuOptionCollection;
+export { MenuOptionCollection };
diff --git a/app/scripts/collections/menu/menu-section-collection.js b/app/scripts/collections/menu/menu-section-collection.js
index 829bd389..d3f63878 100644
--- a/app/scripts/collections/menu/menu-section-collection.js
+++ b/app/scripts/collections/menu/menu-section-collection.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuSectionModel = require('../../models/menu/menu-section-model');
+import Backbone from 'backbone';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
 
 const MenuSectionCollection = Backbone.Collection.extend({
     model: MenuSectionModel
 });
 
-module.exports = MenuSectionCollection;
+export { MenuSectionCollection };
diff --git a/app/scripts/comp/app/app-rights-checker.js b/app/scripts/comp/app/app-rights-checker.js
index 414d69a5..1627c1a9 100644
--- a/app/scripts/comp/app/app-rights-checker.js
+++ b/app/scripts/comp/app/app-rights-checker.js
@@ -1,8 +1,8 @@
-const Features = require('../../util/features');
-const Alerts = require('../ui/alerts');
-const AppSettingsModel = require('../../models/app-settings-model');
-const Launcher = require('../launcher');
-const Locale = require('../../util/locale');
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
 
 const AppRightsChecker = {
     AppPath: '/Applications/KeeWeb.app',
@@ -77,4 +77,4 @@ const AppRightsChecker = {
     }
 };
 
-module.exports = AppRightsChecker;
+export { AppRightsChecker };
diff --git a/app/scripts/comp/app/drag-drop-info.js b/app/scripts/comp/app/drag-drop-info.js
index fd755f5d..ee51953a 100644
--- a/app/scripts/comp/app/drag-drop-info.js
+++ b/app/scripts/comp/app/drag-drop-info.js
@@ -2,4 +2,4 @@ const DragDropInfo = {
     dragObject: null
 };
 
-module.exports = DragDropInfo;
+export { DragDropInfo };
diff --git a/app/scripts/comp/app/dropbox-chooser.js b/app/scripts/comp/app/dropbox-chooser.js
index 177444ef..e3f36f62 100644
--- a/app/scripts/comp/app/dropbox-chooser.js
+++ b/app/scripts/comp/app/dropbox-chooser.js
@@ -1,4 +1,4 @@
-const AppSettingsModel = require('../../models/app-settings-model');
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const ChooserAppKey = 'qp7ctun6qt5n9d6';
 
@@ -104,4 +104,4 @@ DropboxChooser.prototype.readFile = function(url) {
     xhr.send();
 };
 
-module.exports = DropboxChooser;
+export { DropboxChooser };
diff --git a/app/scripts/comp/app/export-api.js b/app/scripts/comp/app/export-api.js
index b2d1b79c..6046711c 100644
--- a/app/scripts/comp/app/export-api.js
+++ b/app/scripts/comp/app/export-api.js
@@ -1,4 +1,4 @@
-const AppSettingsModel = require('../../models/app-settings-model');
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const ExportApi = {
     settings: {
@@ -14,4 +14,4 @@ const ExportApi = {
     }
 };
 
-module.exports = ExportApi;
+export { ExportApi };
diff --git a/app/scripts/comp/app/generator-presets.js b/app/scripts/comp/app/generator-presets.js
index 0595ff2c..f42d3058 100644
--- a/app/scripts/comp/app/generator-presets.js
+++ b/app/scripts/comp/app/generator-presets.js
@@ -1,5 +1,5 @@
-const AppSettingsModel = require('../../models/app-settings-model');
-const Locale = require('../../util/locale');
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Locale } from 'util/locale';
 
 const GeneratorPresets = {
     get defaultPreset() {
@@ -165,4 +165,4 @@ const GeneratorPresets = {
     }
 };
 
-module.exports = GeneratorPresets;
+export { GeneratorPresets };
diff --git a/app/scripts/comp/app/runtime-info.js b/app/scripts/comp/app/runtime-info.js
index 3341bb63..96d7618e 100644
--- a/app/scripts/comp/app/runtime-info.js
+++ b/app/scripts/comp/app/runtime-info.js
@@ -1,4 +1,4 @@
-const Launcher = require('../launcher');
+import { Launcher } from 'comp/launcher';
 
 const RuntimeInfo = {
     version: '@@VERSION',
@@ -9,4 +9,4 @@ const RuntimeInfo = {
     launcher: Launcher ? Launcher.name + ' v' + Launcher.version : ''
 };
 
-module.exports = RuntimeInfo;
+export { RuntimeInfo };
diff --git a/app/scripts/comp/app/shortcuts.js b/app/scripts/comp/app/shortcuts.js
index e29f8cd9..80dad731 100644
--- a/app/scripts/comp/app/shortcuts.js
+++ b/app/scripts/comp/app/shortcuts.js
@@ -1,8 +1,8 @@
-const Features = require('../../util/features');
-const Keys = require('../../const/keys');
-const StringFormat = require('../../util/formatting/string-format');
-const AppSettingsModel = require('../../models/app-settings-model');
-const Launcher = require('../launcher');
+import { Launcher } from 'comp/launcher';
+import { Keys } from 'const/keys';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Features } from 'util/features';
+import { StringFormat } from 'util/formatting/string-format';
 
 let allowedKeys;
 
@@ -128,4 +128,4 @@ const Shortcuts = {
     }
 };
 
-module.exports = Shortcuts;
+export { Shortcuts };
diff --git a/app/scripts/comp/app/single-instance-checker.js b/app/scripts/comp/app/single-instance-checker.js
index 079d199e..92258ac2 100644
--- a/app/scripts/comp/app/single-instance-checker.js
+++ b/app/scripts/comp/app/single-instance-checker.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const Launcher = require('../launcher');
+import Backbone from 'backbone';
+import { Launcher } from 'comp/launcher';
 
 const LocalStorageKeyName = 'instanceCheck';
 const LocalStorageResponseKeyName = 'instanceMaster';
@@ -40,4 +40,4 @@ const SingleInstanceChecker = {
     }
 };
 
-module.exports = SingleInstanceChecker;
+export { SingleInstanceChecker };
diff --git a/app/scripts/comp/app/updater.js b/app/scripts/comp/app/updater.js
index 8361e77b..b3608d0d 100644
--- a/app/scripts/comp/app/updater.js
+++ b/app/scripts/comp/app/updater.js
@@ -1,13 +1,13 @@
-const Backbone = require('backbone');
-const RuntimeInfo = require('../app/runtime-info');
-const Links = require('../../const/links');
-const Launcher = require('../launcher');
-const AppSettingsModel = require('../../models/app-settings-model');
-const UpdateModel = require('../../models/update-model');
-const Transport = require('../browser/transport');
-const Logger = require('../../util/logger');
-const SemVer = require('../../util/data/semver');
-const publicKey = require('public-key.pem').default;
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Transport } from 'comp/browser/transport';
+import { Launcher } from 'comp/launcher';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { UpdateModel } from 'models/update-model';
+import { SemVer } from 'util/data/semver';
+import { Logger } from 'util/logger';
+import publicKey from 'public-key.pem';
 
 const logger = new Logger('updater');
 
@@ -273,4 +273,4 @@ const Updater = {
     }
 };
 
-module.exports = Updater;
+export { Updater };
diff --git a/app/scripts/comp/browser/auth-receiver.js b/app/scripts/comp/browser/auth-receiver.js
index 27d51f9e..8563d558 100644
--- a/app/scripts/comp/browser/auth-receiver.js
+++ b/app/scripts/comp/browser/auth-receiver.js
@@ -1,5 +1,5 @@
-const Features = require('../../util/features');
-const Storage = require('../../storage');
+import { Storage } from 'storage';
+import { Features } from 'util/features';
 
 const AuthReceiver = {
     receive() {
@@ -36,4 +36,4 @@ const AuthReceiver = {
     }
 };
 
-module.exports = AuthReceiver;
+export { AuthReceiver };
diff --git a/app/scripts/comp/browser/copy-paste.js b/app/scripts/comp/browser/copy-paste.js
index 0c911082..1f6696bc 100644
--- a/app/scripts/comp/browser/copy-paste.js
+++ b/app/scripts/comp/browser/copy-paste.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Launcher = require('../launcher');
-const AppSettingsModel = require('../../models/app-settings-model');
+import Backbone from 'backbone';
+import { Launcher } from 'comp/launcher';
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const CopyPaste = {
     simpleCopy: !!(Launcher && Launcher.clipboardSupported),
@@ -68,4 +68,4 @@ const CopyPaste = {
     }
 };
 
-module.exports = CopyPaste;
+export { CopyPaste };
diff --git a/app/scripts/comp/browser/feature-tester.js b/app/scripts/comp/browser/feature-tester.js
index 7bee7707..9349a4ea 100644
--- a/app/scripts/comp/browser/feature-tester.js
+++ b/app/scripts/comp/browser/feature-tester.js
@@ -1,5 +1,5 @@
-const kdbxweb = require('kdbxweb');
-const Features = require('../../util/features');
+import kdbxweb from 'kdbxweb';
+import { Features } from 'util/features';
 
 const FeatureTester = {
     test() {
@@ -63,4 +63,4 @@ const FeatureTester = {
     }
 };
 
-module.exports = FeatureTester;
+export { FeatureTester };
diff --git a/app/scripts/comp/browser/focus-detector.js b/app/scripts/comp/browser/focus-detector.js
index a1a71c49..27f598ec 100644
--- a/app/scripts/comp/browser/focus-detector.js
+++ b/app/scripts/comp/browser/focus-detector.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Features = require('../../util/features');
-const Launcher = require('../launcher');
+import Backbone from 'backbone';
+import { Launcher } from 'comp/launcher';
+import { Features } from 'util/features';
 
 const FocusDetector = {
     init() {
@@ -33,4 +33,4 @@ const FocusDetector = {
     }
 };
 
-module.exports = FocusDetector;
+export { FocusDetector };
diff --git a/app/scripts/comp/browser/idle-tracker.js b/app/scripts/comp/browser/idle-tracker.js
index b10a8a8b..b1509679 100644
--- a/app/scripts/comp/browser/idle-tracker.js
+++ b/app/scripts/comp/browser/idle-tracker.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const AppSettingsModel = require('../../models/app-settings-model');
+import Backbone from 'backbone';
+import { AppSettingsModel } from 'models/app-settings-model';
 
 const IdleTracker = {
     actionTime: Date.now(),
@@ -20,4 +20,4 @@ const IdleTracker = {
 
 Backbone.on('power-monitor-resume', IdleTracker.checkIdle, IdleTracker);
 
-module.exports = IdleTracker;
+export { IdleTracker };
diff --git a/app/scripts/comp/browser/key-handler.js b/app/scripts/comp/browser/key-handler.js
index e93baeaf..6b93e046 100644
--- a/app/scripts/comp/browser/key-handler.js
+++ b/app/scripts/comp/browser/key-handler.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Keys = require('../../const/keys');
-const IdleTracker = require('./idle-tracker');
+import Backbone from 'backbone';
+import { IdleTracker } from 'comp/browser/idle-tracker';
+import { Keys } from 'const/keys';
 
 const shortcutKeyProp = navigator.platform.indexOf('Mac') >= 0 ? 'metaKey' : 'ctrlKey';
 
@@ -132,4 +132,4 @@ const KeyHandler = {
 
 _.extend(KeyHandler, Backbone.Events);
 
-module.exports = KeyHandler;
+export { KeyHandler };
diff --git a/app/scripts/comp/browser/popup-notifier.js b/app/scripts/comp/browser/popup-notifier.js
index 80dd7bdd..79e12157 100644
--- a/app/scripts/comp/browser/popup-notifier.js
+++ b/app/scripts/comp/browser/popup-notifier.js
@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const Alerts = require('../ui/alerts');
-const Launcher = require('../launcher');
-const AuthReceiver = require('./auth-receiver');
-const Links = require('../../const/links');
-const Timeouts = require('../../const/timeouts');
-const Locale = require('../../util/locale');
-const Logger = require('../../util/logger');
+import Backbone from 'backbone';
+import { AuthReceiver } from 'comp/browser/auth-receiver';
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { Links } from 'const/links';
+import { Timeouts } from 'const/timeouts';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
 
 const PopupNotifier = {
     logger: null,
@@ -157,4 +157,4 @@ const PopupNotifier = {
     }
 };
 
-module.exports = PopupNotifier;
+export { PopupNotifier };
diff --git a/app/scripts/comp/browser/secure-input.js b/app/scripts/comp/browser/secure-input.js
index 641d38c4..b13e6a09 100644
--- a/app/scripts/comp/browser/secure-input.js
+++ b/app/scripts/comp/browser/secure-input.js
@@ -1,4 +1,4 @@
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
 
 const SecureInput = function() {
     this.el = null;
@@ -97,4 +97,4 @@ Object.defineProperty(SecureInput.prototype, 'value', {
     }
 });
 
-module.exports = SecureInput;
+export { SecureInput };
diff --git a/app/scripts/comp/browser/transport.js b/app/scripts/comp/browser/transport.js
index bc1ce2df..4a39e6fa 100644
--- a/app/scripts/comp/browser/transport.js
+++ b/app/scripts/comp/browser/transport.js
@@ -1,5 +1,5 @@
-const Launcher = require('../launcher');
-const Logger = require('../../util/logger');
+import { Launcher } from 'comp/launcher';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('transport');
 
@@ -89,4 +89,4 @@ const Transport = {
     }
 };
 
-module.exports = Transport;
+export { Transport };
diff --git a/app/scripts/comp/format/kdbx-to-html.js b/app/scripts/comp/format/kdbx-to-html.js
index 22540ea7..6eb41b61 100644
--- a/app/scripts/comp/format/kdbx-to-html.js
+++ b/app/scripts/comp/format/kdbx-to-html.js
@@ -1,10 +1,10 @@
-const kdbxweb = require('kdbxweb');
-const StringFormat = require('../../util/formatting/string-format');
-const DateFormat = require('../../util/formatting/date-format');
-const Locale = require('../../util/locale');
-const MdToHtml = require('../../util/formatting/md-to-html');
-const Links = require('../../const/links');
-const RuntimeInfo = require('../app/runtime-info');
+import kdbxweb from 'kdbxweb';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Links } from 'const/links';
+import { DateFormat } from 'util/formatting/date-format';
+import { MdToHtml } from 'util/formatting/md-to-html';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
 
 const Templates = {
     db: require('templates/export/db.hbs'),
@@ -123,4 +123,4 @@ const KdbxToHtml = {
     }
 };
 
-module.exports = KdbxToHtml;
+export { KdbxToHtml };
diff --git a/app/scripts/comp/format/otp-qr-reader.js b/app/scripts/comp/format/otp-qr-reader.js
index f457ff72..a1778705 100644
--- a/app/scripts/comp/format/otp-qr-reader.js
+++ b/app/scripts/comp/format/otp-qr-reader.js
@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const Alerts = require('../ui/alerts');
-const Locale = require('../../util/locale');
-const Logger = require('../../util/logger');
-const Features = require('../../util/features');
-const Shortcuts = require('../../comp/app/shortcuts');
-const Otp = require('../../util/data/otp');
-const QrCode = require('jsqrcode');
+import Backbone from 'backbone';
+import QrCode from 'jsqrcode';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { Alerts } from 'comp/ui/alerts';
+import { Otp } from 'util/data/otp';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('otp-qr-reader');
 
@@ -63,10 +63,6 @@ const OtpQrReader = {
                 }
             }
         });
-        // transparent window with QR scanner - is it better? check usability of this
-        // var BrowserWindow = require('../../comp/launcher').remReq('browser-window');
-        // new BrowserWindow({ width: 800, height: 600, show: false, alwaysOnTop: true, backgroundColor: '#80FFFFFF',
-        //     transparent: true }).show();
     },
 
     selectFile() {
@@ -181,4 +177,4 @@ const OtpQrReader = {
 
 _.extend(OtpQrReader, Backbone.Events);
 
-module.exports = OtpQrReader;
+export { OtpQrReader };
diff --git a/app/scripts/comp/launcher/index.js b/app/scripts/comp/launcher/index.js
index 55e11f2e..3280f150 100644
--- a/app/scripts/comp/launcher/index.js
+++ b/app/scripts/comp/launcher/index.js
@@ -1,9 +1,9 @@
 let Launcher;
 
 if (window.process && window.process.versions && window.process.versions.electron) {
-    Launcher = require('./launcher-electron');
+    Launcher = require('./launcher-electron').Launcher;
 } else if (window.cordova) {
-    // Launcher = require('./launcher-cordova'); // commented out, while we don't support cordova
+    // Launcher = require('./launcher-cordova').Launcher; // commented out, while we don't support cordova
 }
 
-module.exports = Launcher;
+export { Launcher };
diff --git a/app/scripts/comp/launcher/launcher-cordova.js b/app/scripts/comp/launcher/launcher-cordova.js
index d510bd6a..14671ead 100644
--- a/app/scripts/comp/launcher/launcher-cordova.js
+++ b/app/scripts/comp/launcher/launcher-cordova.js
@@ -1,6 +1,6 @@
 /* global FingerprintAuth */
 
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const Launcher = {
     name: 'cordova',
@@ -295,4 +295,4 @@ const Launcher = {
     }
 };
 
-module.exports = Launcher;
+export { Launcher };
diff --git a/app/scripts/comp/launcher/launcher-electron.js b/app/scripts/comp/launcher/launcher-electron.js
index 7d72bfef..5b8a5a12 100644
--- a/app/scripts/comp/launcher/launcher-electron.js
+++ b/app/scripts/comp/launcher/launcher-electron.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Locale = require('../../util/locale');
-const Logger = require('../../util/logger');
+import Backbone from 'backbone';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('launcher');
 
@@ -309,4 +309,4 @@ if (window.launcherOpenedFile) {
 }
 Backbone.on('app-ready', () => setTimeout(() => Launcher.checkOpenFiles(), 0));
 
-module.exports = Launcher;
+export { Launcher };
diff --git a/app/scripts/comp/settings/settings-manager.js b/app/scripts/comp/settings/settings-manager.js
index ccae768d..f55c8253 100644
--- a/app/scripts/comp/settings/settings-manager.js
+++ b/app/scripts/comp/settings/settings-manager.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Locale = require('../../util/locale');
-const Features = require('../../util/features');
+import Backbone from 'backbone';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
 
 const appleThemes = {
     macdark: 'setGenThemeMacDark'
@@ -97,4 +97,4 @@ const SettingsManager = {
     }
 };
 
-module.exports = SettingsManager;
+export { SettingsManager };
diff --git a/app/scripts/comp/settings/settings-store.js b/app/scripts/comp/settings/settings-store.js
index 78cebbe1..f14021e4 100644
--- a/app/scripts/comp/settings/settings-store.js
+++ b/app/scripts/comp/settings/settings-store.js
@@ -1,6 +1,6 @@
-const Launcher = require('../launcher');
-const StringFormat = require('../../util/formatting/string-format');
-const Logger = require('../../util/logger');
+import { Launcher } from 'comp/launcher';
+import { StringFormat } from 'util/formatting/string-format';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('settings');
 
@@ -61,4 +61,4 @@ const SettingsStore = {
     }
 };
 
-module.exports = SettingsStore;
+export { SettingsStore };
diff --git a/app/scripts/comp/ui/alerts.js b/app/scripts/comp/ui/alerts.js
index 389a58d7..2dfbee5f 100644
--- a/app/scripts/comp/ui/alerts.js
+++ b/app/scripts/comp/ui/alerts.js
@@ -1,5 +1,5 @@
-const ModalView = require('../../views/modal-view');
-const Locale = require('../../util/locale');
+import { Locale } from 'util/locale';
+import { ModalView } from 'views/modal-view';
 
 const Alerts = {
     alertDisplayed: false,
@@ -117,4 +117,4 @@ const Alerts = {
     }
 };
 
-module.exports = Alerts;
+export { Alerts };
diff --git a/app/scripts/const/colors.js b/app/scripts/const/colors.js
index b7abcb31..895bdb83 100644
--- a/app/scripts/const/colors.js
+++ b/app/scripts/const/colors.js
@@ -20,4 +20,4 @@ const Colors = {
     }
 };
 
-module.exports = Colors;
+export { Colors };
diff --git a/app/scripts/const/icon-map.js b/app/scripts/const/icon-map.js
index 9fd2b991..1079d691 100644
--- a/app/scripts/const/icon-map.js
+++ b/app/scripts/const/icon-map.js
@@ -70,4 +70,4 @@ const IconMap = [
     'mobile'
 ];
 
-module.exports = IconMap;
+export { IconMap };
diff --git a/app/scripts/const/keys.js b/app/scripts/const/keys.js
index c449b5a7..5b3f82f1 100644
--- a/app/scripts/const/keys.js
+++ b/app/scripts/const/keys.js
@@ -116,4 +116,4 @@ const Keys = {
     DOM_VK_META: 224
 };
 
-module.exports = Keys;
+export { Keys };
diff --git a/app/scripts/const/links.js b/app/scripts/const/links.js
index cf47102e..338037ad 100644
--- a/app/scripts/const/links.js
+++ b/app/scripts/const/links.js
@@ -17,4 +17,4 @@ const Links = {
     PluginDevelopStart: 'https://github.com/keeweb/keeweb/wiki/Plugins'
 };
 
-module.exports = Links;
+export { Links };
diff --git a/app/scripts/const/timeouts.js b/app/scripts/const/timeouts.js
index 94e2e362..6b272948 100644
--- a/app/scripts/const/timeouts.js
+++ b/app/scripts/const/timeouts.js
@@ -14,4 +14,4 @@ const Timeouts = {
     LinkDownloadRevoke: 10 * 1000 * 60
 };
 
-module.exports = Timeouts;
+export { Timeouts };
diff --git a/app/scripts/hbs-helpers/add.js b/app/scripts/hbs-helpers/add.js
index f5b5b494..f604118b 100644
--- a/app/scripts/hbs-helpers/add.js
+++ b/app/scripts/hbs-helpers/add.js
@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 // inspired by https://stackoverflow.com/questions/22103989/adding-offset-to-index-when-looping-through-items-in-handlebars/39588001#39588001
 Handlebars.registerHelper('add', (lvalue, rvalue) => parseInt(lvalue) + parseInt(rvalue));
diff --git a/app/scripts/hbs-helpers/cmp.js b/app/scripts/hbs-helpers/cmp.js
index d9bae970..4f819edb 100644
--- a/app/scripts/hbs-helpers/cmp.js
+++ b/app/scripts/hbs-helpers/cmp.js
@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('cmp', function(lvalue, rvalue, op, options) {
     let cond;
diff --git a/app/scripts/hbs-helpers/ifemptyoreq.js b/app/scripts/hbs-helpers/ifemptyoreq.js
index 86b538d3..aee4c4a3 100644
--- a/app/scripts/hbs-helpers/ifemptyoreq.js
+++ b/app/scripts/hbs-helpers/ifemptyoreq.js
@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('ifemptyoreq', function(lvalue, rvalue, options) {
     return !lvalue || lvalue === rvalue ? options.fn(this) : options.inverse(this);
diff --git a/app/scripts/hbs-helpers/ifeq.js b/app/scripts/hbs-helpers/ifeq.js
index 16a0d77f..fe1e0d7a 100644
--- a/app/scripts/hbs-helpers/ifeq.js
+++ b/app/scripts/hbs-helpers/ifeq.js
@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('ifeq', function(lvalue, rvalue, options) {
     return lvalue === rvalue ? options.fn(this) : options.inverse(this);
diff --git a/app/scripts/hbs-helpers/ifneq.js b/app/scripts/hbs-helpers/ifneq.js
index ed9b6e7d..19170fa3 100644
--- a/app/scripts/hbs-helpers/ifneq.js
+++ b/app/scripts/hbs-helpers/ifneq.js
@@ -1,4 +1,4 @@
-const Handlebars = require('hbs');
+import Handlebars from 'hbs';
 
 Handlebars.registerHelper('ifneq', function(lvalue, rvalue, options) {
     return lvalue !== rvalue ? options.fn(this) : options.inverse(this);
diff --git a/app/scripts/hbs-helpers/index.js b/app/scripts/hbs-helpers/index.js
index f55cd385..a7b23692 100644
--- a/app/scripts/hbs-helpers/index.js
+++ b/app/scripts/hbs-helpers/index.js
@@ -1,6 +1,6 @@
-require('./add');
-require('./cmp');
-require('./ifeq');
-require('./ifneq');
-require('./ifemptyoreq');
-require('./res');
+import 'hbs-helpers/add';
+import 'hbs-helpers/cmp';
+import 'hbs-helpers/ifeq';
+import 'hbs-helpers/ifneq';
+import 'hbs-helpers/ifemptyoreq';
+import 'hbs-helpers/res';
diff --git a/app/scripts/hbs-helpers/res.js b/app/scripts/hbs-helpers/res.js
index ff11f25e..de701d45 100644
--- a/app/scripts/hbs-helpers/res.js
+++ b/app/scripts/hbs-helpers/res.js
@@ -1,5 +1,5 @@
-const Handlebars = require('hbs');
-const Locale = require('../util/locale');
+import Handlebars from 'hbs';
+import { Locale } from 'util/locale';
 
 Handlebars.registerHelper('res', function(key, options) {
     let value = Locale[key];
diff --git a/app/scripts/models/app-model.js b/app/scripts/models/app-model.js
index 467b485b..c6cc5f08 100644
--- a/app/scripts/models/app-model.js
+++ b/app/scripts/models/app-model.js
@@ -1,27 +1,26 @@
-const Backbone = require('backbone');
-const AppSettingsModel = require('./app-settings-model');
-const MenuModel = require('./menu/menu-model');
-const EntryModel = require('./entry-model');
-const GroupModel = require('./group-model');
-const FileCollection = require('../collections/file-collection');
-const EntryCollection = require('../collections/entry-collection');
-const FileInfoCollection = require('../collections/file-info-collection');
-const FileModel = require('./file-model');
-const FileInfoModel = require('./file-info-model');
-const Storage = require('../storage');
-const Timeouts = require('../const/timeouts');
-const IdGenerator = require('../util/generators/id-generator');
-const Logger = require('../util/logger');
-const Features = require('../util/features');
-const DateFormat = require('../util/formatting/date-format');
-const UrlFormat = require('../util/formatting/url-format');
-const AutoType = require('../auto-type');
-const Launcher = require('../comp/launcher');
-const RuntimeInfo = require('../comp/app/runtime-info');
-const PluginManager = require('../plugins/plugin-manager');
-const Locale = require('../util/locale');
-
-require('../util/kdbxweb/protected-value-ex');
+import { AutoType } from 'auto-type';
+import Backbone from 'backbone';
+import { Storage } from 'storage';
+import { EntryCollection } from 'collections/entry-collection';
+import { FileCollection } from 'collections/file-collection';
+import { FileInfoCollection } from 'collections/file-info-collection';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Launcher } from 'comp/launcher';
+import { Timeouts } from 'const/timeouts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { EntryModel } from 'models/entry-model';
+import { FileInfoModel } from 'models/file-info-model';
+import { FileModel } from 'models/file-model';
+import { GroupModel } from 'models/group-model';
+import { MenuModel } from 'models/menu/menu-model';
+import { PluginManager } from 'plugins/plugin-manager';
+import { Features } from 'util/features';
+import { DateFormat } from 'util/formatting/date-format';
+import { UrlFormat } from 'util/formatting/url-format';
+import { IdGenerator } from 'util/generators/id-generator';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
+import 'util/kdbxweb/protected-value-ex';
 
 const AppModel = Backbone.Model.extend({
     defaults: {},
@@ -1163,4 +1162,4 @@ const AppModel = Backbone.Model.extend({
     }
 });
 
-module.exports = AppModel;
+export { AppModel };
diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js
index fceb5183..b24f09c1 100644
--- a/app/scripts/models/app-settings-model.js
+++ b/app/scripts/models/app-settings-model.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
 
 const AppSettingsModel = Backbone.Model.extend({
     defaults: {
@@ -80,4 +80,4 @@ const AppSettingsModel = Backbone.Model.extend({
 
 AppSettingsModel.instance = new AppSettingsModel();
 
-module.exports = AppSettingsModel;
+export { AppSettingsModel };
diff --git a/app/scripts/models/attachment-model.js b/app/scripts/models/attachment-model.js
index 3d6cfcce..acdf5398 100644
--- a/app/scripts/models/attachment-model.js
+++ b/app/scripts/models/attachment-model.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const AttachmentModel = Backbone.Model.extend({
     defaults: {},
@@ -168,4 +168,4 @@ AttachmentModel.fromAttachment = function(att) {
     return model;
 };
 
-module.exports = AttachmentModel;
+export { AttachmentModel };
diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js
index 791c89d8..05ad049c 100644
--- a/app/scripts/models/entry-model.js
+++ b/app/scripts/models/entry-model.js
@@ -1,12 +1,12 @@
-const Backbone = require('backbone');
-const AttachmentModel = require('./attachment-model');
-const IconMap = require('../const/icon-map');
-const Color = require('../util/data/color');
-const IconUrlFormat = require('../util/formatting/icon-url-format');
-const Otp = require('../util/data/otp');
-const kdbxweb = require('kdbxweb');
-const Ranking = require('../util/data/ranking');
-const KdbxToHtml = require('../comp/format/kdbx-to-html');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { KdbxToHtml } from 'comp/format/kdbx-to-html';
+import { IconMap } from 'const/icon-map';
+import { AttachmentModel } from 'models/attachment-model';
+import { Color } from 'util/data/color';
+import { Otp } from 'util/data/otp';
+import { Ranking } from 'util/data/ranking';
+import { IconUrlFormat } from 'util/formatting/icon-url-format';
 
 const EntryModel = Backbone.Model.extend({
     defaults: {},
@@ -731,4 +731,4 @@ EntryModel.newEntry = function(group, file) {
     return model;
 };
 
-module.exports = EntryModel;
+export { EntryModel };
diff --git a/app/scripts/models/file-info-model.js b/app/scripts/models/file-info-model.js
index eb9693c4..815eb654 100644
--- a/app/scripts/models/file-info-model.js
+++ b/app/scripts/models/file-info-model.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const FileInfoModel = Backbone.Model.extend({
     defaults: {
@@ -31,4 +31,4 @@ const FileInfoModel = Backbone.Model.extend({
     }
 });
 
-module.exports = FileInfoModel;
+export { FileInfoModel };
diff --git a/app/scripts/models/file-model.js b/app/scripts/models/file-model.js
index d59a64c1..c1841f73 100644
--- a/app/scripts/models/file-model.js
+++ b/app/scripts/models/file-model.js
@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const GroupCollection = require('../collections/group-collection');
-const GroupModel = require('./group-model');
-const IconUrlFormat = require('../util/formatting/icon-url-format');
-const Logger = require('../util/logger');
-const KdbxToHtml = require('../comp/format/kdbx-to-html');
-const kdbxweb = require('kdbxweb');
-const demoFileData = require('demo.kdbx');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import demoFileData from 'demo.kdbx';
+import { GroupCollection } from 'collections/group-collection';
+import { KdbxToHtml } from 'comp/format/kdbx-to-html';
+import { GroupModel } from 'models/group-model';
+import { IconUrlFormat } from 'util/formatting/icon-url-format';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('file');
 
@@ -713,4 +713,4 @@ FileModel.createKeyFileWithHash = function(hash) {
     return kdbxweb.Credentials.createKeyFileWithHash(hash);
 };
 
-module.exports = FileModel;
+export { FileModel };
diff --git a/app/scripts/models/group-model.js b/app/scripts/models/group-model.js
index 9f25ba7b..b153be70 100644
--- a/app/scripts/models/group-model.js
+++ b/app/scripts/models/group-model.js
@@ -1,11 +1,12 @@
-const MenuItemModel = require('./menu/menu-item-model');
-const EntryModel = require('../models/entry-model');
-const IconMap = require('../const/icon-map');
-const IconUrlFormat = require('../util/formatting/icon-url-format');
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
+import { IconMap } from 'const/icon-map';
+import { EntryModel } from 'models/entry-model';
+import { MenuItemModel } from 'models/menu/menu-item-model';
+import { IconUrlFormat } from 'util/formatting/icon-url-format';
+import { GroupCollection } from 'collections/group-collection';
+import { EntryCollection } from 'collections/entry-collection';
+
 const KdbxIcons = kdbxweb.Consts.Icons;
-let GroupCollection;
-let EntryCollection;
 
 const DefaultAutoTypeSequence = '{USERNAME}{TAB}{PASSWORD}{ENTER}';
 
@@ -23,15 +24,6 @@ const GroupModel = MenuItemModel.extend({
         autoTypeSeq: null
     }),
 
-    initialize() {
-        if (!GroupCollection) {
-            GroupCollection = require('../collections/group-collection');
-        }
-        if (!EntryCollection) {
-            EntryCollection = require('../collections/entry-collection');
-        }
-    },
-
     setGroup(group, file, parentGroup) {
         const isRecycleBin = group.uuid.equals(file.db.meta.recycleBinUuid);
         const id = file.subId(group.uuid.id);
@@ -362,4 +354,4 @@ GroupModel.newGroup = function(group, file) {
     return model;
 };
 
-module.exports = GroupModel;
+export { GroupModel };
diff --git a/app/scripts/models/menu/groups-menu-model.js b/app/scripts/models/menu/groups-menu-model.js
index 24855765..b337b0a7 100644
--- a/app/scripts/models/menu/groups-menu-model.js
+++ b/app/scripts/models/menu/groups-menu-model.js
@@ -1,5 +1,5 @@
-const MenuSectionModel = require('./menu-section-model');
-const GroupCollection = require('../../collections/group-collection');
+import { GroupCollection } from 'collections/group-collection';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
 
 const GroupsMenuModel = MenuSectionModel.extend({
     defaults: _.extend({}, MenuSectionModel.prototype.defaults, {
@@ -12,8 +12,8 @@ const GroupsMenuModel = MenuSectionModel.extend({
     },
 
     _loadItemCollectionType() {
-        return require('../../collections/group-collection');
+        return require('collections/group-collection').GroupCollection;
     }
 });
 
-module.exports = GroupsMenuModel;
+export { GroupsMenuModel };
diff --git a/app/scripts/models/menu/menu-item-model.js b/app/scripts/models/menu/menu-item-model.js
index aff23848..4e02fd7d 100644
--- a/app/scripts/models/menu/menu-item-model.js
+++ b/app/scripts/models/menu/menu-item-model.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const MenuOptionCollection = require('../../collections/menu/menu-option-collection');
+import Backbone from 'backbone';
+import { MenuOptionCollection } from 'collections/menu/menu-option-collection';
 let ItemCollection;
 
 const MenuItemModel = Backbone.Model.extend({
@@ -29,7 +29,7 @@ const MenuItemModel = Backbone.Model.extend({
     },
 
     _loadItemCollectionType() {
-        return require('../../collections/menu/menu-item-collection');
+        return require('collections/menu/menu-item-collection').MenuItemCollection;
     },
 
     addItem(item) {
@@ -67,4 +67,4 @@ const MenuItemModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuItemModel;
+export { MenuItemModel };
diff --git a/app/scripts/models/menu/menu-model.js b/app/scripts/models/menu/menu-model.js
index 643c07ae..dae8e40d 100644
--- a/app/scripts/models/menu/menu-model.js
+++ b/app/scripts/models/menu/menu-model.js
@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const MenuSectionCollection = require('../../collections/menu/menu-section-collection');
-const MenuSectionModel = require('./menu-section-model');
-const GroupsMenuModel = require('./groups-menu-model');
-const Locale = require('../../util/locale');
-const StringFormat = require('../../util/formatting/string-format');
-const Keys = require('../../const/keys');
-const Colors = require('../../const/colors');
+import Backbone from 'backbone';
+import { MenuSectionCollection } from 'collections/menu/menu-section-collection';
+import { Colors } from 'const/colors';
+import { Keys } from 'const/keys';
+import { GroupsMenuModel } from 'models/menu/groups-menu-model';
+import { MenuSectionModel } from 'models/menu/menu-section-model';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
 
 const MenuModel = Backbone.Model.extend({
     defaults: {
@@ -220,4 +220,4 @@ const MenuModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuModel;
+export { MenuModel };
diff --git a/app/scripts/models/menu/menu-option-model.js b/app/scripts/models/menu/menu-option-model.js
index 6139ee55..a333c946 100644
--- a/app/scripts/models/menu/menu-option-model.js
+++ b/app/scripts/models/menu/menu-option-model.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const MenuOptionModel = Backbone.Model.extend({
     defaults: {
@@ -10,4 +10,4 @@ const MenuOptionModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuOptionModel;
+export { MenuOptionModel };
diff --git a/app/scripts/models/menu/menu-section-model.js b/app/scripts/models/menu/menu-section-model.js
index 008a66db..449bebc4 100644
--- a/app/scripts/models/menu/menu-section-model.js
+++ b/app/scripts/models/menu/menu-section-model.js
@@ -1,7 +1,7 @@
-const Backbone = require('backbone');
-const MenuItemCollection = require('../../collections/menu/menu-item-collection');
+import Backbone from 'backbone';
+import { MenuItemCollection } from 'collections/menu/menu-item-collection';
 
-const MenuItemModel = Backbone.Model.extend({
+const MenuSectionModel = Backbone.Model.extend({
     defaults: {
         items: null,
         scrollable: false,
@@ -56,4 +56,4 @@ const MenuItemModel = Backbone.Model.extend({
     }
 });
 
-module.exports = MenuItemModel;
+export { MenuSectionModel };
diff --git a/app/scripts/models/runtime-data-model.js b/app/scripts/models/runtime-data-model.js
index 86702244..c6b13f60 100644
--- a/app/scripts/models/runtime-data-model.js
+++ b/app/scripts/models/runtime-data-model.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
 
 const RuntimeDataModel = Backbone.Model.extend({
     defaults: {},
@@ -27,4 +27,4 @@ const RuntimeDataModel = Backbone.Model.extend({
 
 RuntimeDataModel.instance = new RuntimeDataModel();
 
-module.exports = RuntimeDataModel;
+export { RuntimeDataModel };
diff --git a/app/scripts/models/update-model.js b/app/scripts/models/update-model.js
index 352abecd..881fffdc 100644
--- a/app/scripts/models/update-model.js
+++ b/app/scripts/models/update-model.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import { SettingsStore } from 'comp/settings/settings-store';
 
 const UpdateModel = Backbone.Model.extend({
     defaults: {
@@ -47,4 +47,4 @@ const UpdateModel = Backbone.Model.extend({
 
 UpdateModel.instance = new UpdateModel();
 
-module.exports = UpdateModel;
+export { UpdateModel };
diff --git a/app/scripts/plugins/plugin-api.js b/app/scripts/plugins/plugin-api.js
index 0f36a3ca..b9057d40 100644
--- a/app/scripts/plugins/plugin-api.js
+++ b/app/scripts/plugins/plugin-api.js
@@ -16,4 +16,4 @@ const PluginApi = {
     }
 };
 
-module.exports = PluginApi;
+export { PluginApi };
diff --git a/app/scripts/plugins/plugin-collection.js b/app/scripts/plugins/plugin-collection.js
index be0a2543..cf06e1d0 100644
--- a/app/scripts/plugins/plugin-collection.js
+++ b/app/scripts/plugins/plugin-collection.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const Plugin = require('./plugin');
+import Backbone from 'backbone';
+import { Plugin } from 'plugins/plugin';
 
 const PluginCollection = Backbone.Collection.extend({
     model: Plugin
 });
 
-module.exports = PluginCollection;
+export { PluginCollection };
diff --git a/app/scripts/plugins/plugin-gallery.js b/app/scripts/plugins/plugin-gallery.js
index 27f496bf..82a10d2f 100644
--- a/app/scripts/plugins/plugin-gallery.js
+++ b/app/scripts/plugins/plugin-gallery.js
@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const kdbxweb = require('kdbxweb');
-const Links = require('../const/links');
-const SignatureVerifier = require('../util/data/signature-verifier');
-const Logger = require('../util/logger');
-const SettingsStore = require('../comp/settings/settings-store');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { Links } from 'const/links';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+import { Logger } from 'util/logger';
 
 const PluginGallery = {
     logger: new Logger('plugin-gallery'),
@@ -85,4 +85,4 @@ const PluginGallery = {
     }
 };
 
-module.exports = PluginGallery;
+export { PluginGallery };
diff --git a/app/scripts/plugins/plugin-manager.js b/app/scripts/plugins/plugin-manager.js
index 6fd90009..46ba0b26 100644
--- a/app/scripts/plugins/plugin-manager.js
+++ b/app/scripts/plugins/plugin-manager.js
@@ -1,11 +1,11 @@
-const Backbone = require('backbone');
-const Plugin = require('./plugin');
-const PluginCollection = require('./plugin-collection');
-const PluginGallery = require('./plugin-gallery');
-const SettingsStore = require('../comp/settings/settings-store');
-const RuntimeInfo = require('../comp/app/runtime-info');
-const SignatureVerifier = require('../util/data/signature-verifier');
-const Logger = require('../util/logger');
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { SettingsStore } from 'comp/settings/settings-store';
+import { Plugin } from 'plugins/plugin';
+import { PluginCollection } from 'plugins/plugin-collection';
+import { PluginGallery } from 'plugins/plugin-gallery';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+import { Logger } from 'util/logger';
 
 const PluginManager = Backbone.Model.extend({
     UpdateInterval: 1000 * 60 * 60 * 24 * 7,
@@ -235,4 +235,4 @@ const PluginManager = Backbone.Model.extend({
 
 PluginManager.instance = new PluginManager();
 
-module.exports = PluginManager;
+export { PluginManager };
diff --git a/app/scripts/plugins/plugin.js b/app/scripts/plugins/plugin.js
index 045c9371..e9be4ff2 100644
--- a/app/scripts/plugins/plugin.js
+++ b/app/scripts/plugins/plugin.js
@@ -1,15 +1,15 @@
-const kdbxweb = require('kdbxweb');
-const Backbone = require('backbone');
-const PluginApi = require('./plugin-api');
-const ThemeVars = require('./theme-vars');
-const Logger = require('../util/logger');
-const SettingsManager = require('../comp/settings/settings-manager');
-const IoCache = require('../storage/io-cache');
-const AppSettingsModel = require('../models/app-settings-model');
-const BaseLocale = require('../locales/base.json');
-const SignatureVerifier = require('../util/data/signature-verifier');
-const SemVer = require('../util/data/semver');
-const RuntimeInfo = require('../comp/app/runtime-info');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import BaseLocale from 'locales/base.json';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { PluginApi } from 'plugins/plugin-api';
+import { ThemeVars } from 'plugins/theme-vars';
+import { IoCache } from 'storage/io-cache';
+import { SemVer } from 'util/data/semver';
+import { SignatureVerifier } from 'util/data/signature-verifier';
+import { Logger } from 'util/logger';
 
 const commonLogger = new Logger('plugin');
 const io = new IoCache({
@@ -692,4 +692,4 @@ function httpGet(url, binary) {
     });
 }
 
-module.exports = Plugin;
+export { Plugin };
diff --git a/app/scripts/plugins/theme-vars.js b/app/scripts/plugins/theme-vars.js
index c90d8597..77034fec 100644
--- a/app/scripts/plugins/theme-vars.js
+++ b/app/scripts/plugins/theme-vars.js
@@ -1,6 +1,7 @@
+import { Color } from 'util/data/color';
+
 const ThemeVarsScss = require('raw-loader!../../styles/base/_theme-vars.scss').default;
 const ThemeDefaults = require('../../styles/themes/_theme-defaults.scss');
-const Color = require('../util/data/color');
 
 const ThemeVars = {
     themeDefaults: null,
@@ -118,4 +119,4 @@ const ThemeVars = {
     }
 };
 
-module.exports = ThemeVars;
+export { ThemeVars };
diff --git a/app/scripts/presenters/entry-presenter.js b/app/scripts/presenters/entry-presenter.js
index b7f1119a..44679324 100644
--- a/app/scripts/presenters/entry-presenter.js
+++ b/app/scripts/presenters/entry-presenter.js
@@ -1,5 +1,5 @@
-const DateFormat = require('../util/formatting/date-format');
-const Locale = require('../util/locale');
+import { DateFormat } from 'util/formatting/date-format';
+import { Locale } from 'util/locale';
 
 const EntryPresenter = function(descField, noColor, activeEntryId) {
     this.entry = null;
@@ -88,4 +88,4 @@ EntryPresenter.prototype = {
     }
 };
 
-module.exports = EntryPresenter;
+export { EntryPresenter };
diff --git a/app/scripts/storage/impl/storage-cache.js b/app/scripts/storage/impl/storage-cache.js
index 40092106..28ff632f 100644
--- a/app/scripts/storage/impl/storage-cache.js
+++ b/app/scripts/storage/impl/storage-cache.js
@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const IoBrowserCache = require('../io-browser-cache');
+import { IoBrowserCache } from 'storage/io-browser-cache';
+import { StorageBase } from 'storage/storage-base';
 
 const StorageCache = StorageBase.extend({
     name: 'cache',
@@ -29,4 +29,4 @@ const StorageCache = StorageBase.extend({
     }
 });
 
-module.exports = StorageCache;
+export { StorageCache };
diff --git a/app/scripts/storage/impl/storage-dropbox.js b/app/scripts/storage/impl/storage-dropbox.js
index 16cfd6bc..91c8d073 100644
--- a/app/scripts/storage/impl/storage-dropbox.js
+++ b/app/scripts/storage/impl/storage-dropbox.js
@@ -1,6 +1,6 @@
-const StorageBase = require('../storage-base');
-const UrlFormat = require('../../util/formatting/url-format');
-const Features = require('../../util/features');
+import { StorageBase } from 'storage/storage-base';
+import { Features } from 'util/features';
+import { UrlFormat } from 'util/formatting/url-format';
 
 const DropboxKeys = {
     AppFolder: 'qp7ctun6qt5n9d6',
@@ -376,4 +376,4 @@ const StorageDropbox = StorageBase.extend({
     }
 });
 
-module.exports = StorageDropbox;
+export { StorageDropbox };
diff --git a/app/scripts/storage/impl/storage-file-cache.js b/app/scripts/storage/impl/storage-file-cache.js
index dbd5428a..a8a775d5 100644
--- a/app/scripts/storage/impl/storage-file-cache.js
+++ b/app/scripts/storage/impl/storage-file-cache.js
@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
+import { StorageBase } from 'storage/storage-base';
 
 const StorageFileCache = StorageBase.extend({
     name: 'cache',
@@ -104,4 +104,4 @@ const StorageFileCache = StorageBase.extend({
     }
 });
 
-module.exports = StorageFileCache;
+export { StorageFileCache };
diff --git a/app/scripts/storage/impl/storage-file.js b/app/scripts/storage/impl/storage-file.js
index 3442784c..f77e8533 100644
--- a/app/scripts/storage/impl/storage-file.js
+++ b/app/scripts/storage/impl/storage-file.js
@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const Launcher = require('../../comp/launcher');
+import { Launcher } from 'comp/launcher';
+import { StorageBase } from 'storage/storage-base';
 
 const fileWatchers = {};
 
@@ -178,4 +178,4 @@ const StorageFile = StorageBase.extend({
     }
 });
 
-module.exports = StorageFile;
+export { StorageFile };
diff --git a/app/scripts/storage/impl/storage-gdrive.js b/app/scripts/storage/impl/storage-gdrive.js
index d031cce7..7b27c697 100644
--- a/app/scripts/storage/impl/storage-gdrive.js
+++ b/app/scripts/storage/impl/storage-gdrive.js
@@ -1,5 +1,5 @@
-const StorageBase = require('../storage-base');
-const Locale = require('../../util/locale');
+import { StorageBase } from 'storage/storage-base';
+import { Locale } from 'util/locale';
 
 const GDriveClientId = {
     Local: '783608538594-36tkdh8iscrq8t8dq87gghubnhivhjp5.apps.googleusercontent.com',
@@ -255,4 +255,4 @@ const StorageGDrive = StorageBase.extend({
     }
 });
 
-module.exports = StorageGDrive;
+export { StorageGDrive };
diff --git a/app/scripts/storage/impl/storage-onedrive.js b/app/scripts/storage/impl/storage-onedrive.js
index 0e7510f1..9644ac8a 100644
--- a/app/scripts/storage/impl/storage-onedrive.js
+++ b/app/scripts/storage/impl/storage-onedrive.js
@@ -1,4 +1,4 @@
-const StorageBase = require('../storage-base');
+import { StorageBase } from 'storage/storage-base';
 
 const OneDriveClientId = {
     Production: '000000004818ED3A',
@@ -277,4 +277,4 @@ if (document.querySelectorAll(selector).length === 1) document.querySelector(sel
     }
 });
 
-module.exports = StorageOneDrive;
+export { StorageOneDrive };
diff --git a/app/scripts/storage/impl/storage-webdav.js b/app/scripts/storage/impl/storage-webdav.js
index 7a25706e..a3544193 100644
--- a/app/scripts/storage/impl/storage-webdav.js
+++ b/app/scripts/storage/impl/storage-webdav.js
@@ -1,4 +1,4 @@
-const StorageBase = require('../storage-base');
+import { StorageBase } from 'storage/storage-base';
 
 const StorageWebDav = StorageBase.extend({
     name: 'webdav',
@@ -386,4 +386,4 @@ const StorageWebDav = StorageBase.extend({
     }
 });
 
-module.exports = StorageWebDav;
+export { StorageWebDav };
diff --git a/app/scripts/storage/index.js b/app/scripts/storage/index.js
index a5e6cc92..b7da97a6 100644
--- a/app/scripts/storage/index.js
+++ b/app/scripts/storage/index.js
@@ -1,11 +1,11 @@
-const Launcher = require('../comp/launcher');
-const StorageFile = require('./impl/storage-file');
-const StorageFileCache = require('./impl/storage-file-cache');
-const StorageCache = require('./impl/storage-cache');
-const StorageDropbox = require('./impl/storage-dropbox');
-const StorageGDrive = require('./impl/storage-gdrive');
-const StorageOneDrive = require('./impl/storage-onedrive');
-const StorageWebDav = require('./impl/storage-webdav');
+import { Launcher } from 'comp/launcher';
+import { StorageCache } from 'storage/impl/storage-cache';
+import { StorageDropbox } from 'storage/impl/storage-dropbox';
+import { StorageFile } from 'storage/impl/storage-file';
+import { StorageFileCache } from 'storage/impl/storage-file-cache';
+import { StorageGDrive } from 'storage/impl/storage-gdrive';
+import { StorageOneDrive } from 'storage/impl/storage-onedrive';
+import { StorageWebDav } from 'storage/impl/storage-webdav';
 
 const BuiltInStorage = {
     file: new StorageFile(),
@@ -19,9 +19,9 @@ const ThirdPartyStorage = {
     webdav: new StorageWebDav()
 };
 
-const storage = BuiltInStorage;
+const Storage = BuiltInStorage;
 if (!Launcher || Launcher.thirdPartyStoragesSupported) {
-    _.extend(storage, ThirdPartyStorage);
+    _.extend(Storage, ThirdPartyStorage);
 }
 
-module.exports = storage;
+export { Storage };
diff --git a/app/scripts/storage/io-browser-cache.js b/app/scripts/storage/io-browser-cache.js
index d25cb8d6..9090f749 100644
--- a/app/scripts/storage/io-browser-cache.js
+++ b/app/scripts/storage/io-browser-cache.js
@@ -137,4 +137,4 @@ _.extend(IoBrowserCache.prototype, {
     }
 });
 
-module.exports = IoBrowserCache;
+export { IoBrowserCache };
diff --git a/app/scripts/storage/io-cache.js b/app/scripts/storage/io-cache.js
index 7f53840f..de83076b 100644
--- a/app/scripts/storage/io-cache.js
+++ b/app/scripts/storage/io-cache.js
@@ -1,5 +1,7 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
+import { IoFileCache } from 'storage/io-file-cache';
+import { IoBrowserCache } from 'storage/io-browser-cache';
 
-const IoCache = Launcher ? require('./io-file-cache') : require('./io-browser-cache');
+const IoCache = Launcher ? IoFileCache : IoBrowserCache;
 
-module.exports = IoCache;
+export { IoCache };
diff --git a/app/scripts/storage/io-file-cache.js b/app/scripts/storage/io-file-cache.js
index 2c907446..cfa99557 100644
--- a/app/scripts/storage/io-file-cache.js
+++ b/app/scripts/storage/io-file-cache.js
@@ -1,4 +1,4 @@
-const Launcher = require('../comp/launcher');
+import { Launcher } from 'comp/launcher';
 
 const IoFileCache = function(config) {
     this.basePath = null;
@@ -99,4 +99,4 @@ _.extend(IoFileCache.prototype, {
     }
 });
 
-module.exports = IoFileCache;
+export { IoFileCache };
diff --git a/app/scripts/storage/storage-base.js b/app/scripts/storage/storage-base.js
index fd8080eb..13b2ac12 100644
--- a/app/scripts/storage/storage-base.js
+++ b/app/scripts/storage/storage-base.js
@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const Logger = require('../util/logger');
-const AppSettingsModel = require('../models/app-settings-model');
-const RuntimeDataModel = require('../models/runtime-data-model');
-const Links = require('../const/links');
-const Features = require('../util/features');
+import Backbone from 'backbone';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { RuntimeDataModel } from 'models/runtime-data-model';
+import { Features } from 'util/features';
+import { Logger } from 'util/logger';
 
 const MaxRequestRetries = 3;
 
@@ -267,4 +267,4 @@ _.extend(StorageBase.prototype, {
 
 StorageBase.extend = Backbone.Model.extend;
 
-module.exports = StorageBase;
+export { StorageBase };
diff --git a/app/scripts/util/data/color.js b/app/scripts/util/data/color.js
index 6b2a60d0..c17fe92d 100644
--- a/app/scripts/util/data/color.js
+++ b/app/scripts/util/data/color.js
@@ -1,4 +1,4 @@
-const Colors = require('../../const/colors');
+import { Colors } from 'const/colors';
 
 const KnownColors = {};
 
@@ -130,4 +130,4 @@ function hex(num) {
     return str.length < 2 ? '0' + str : str;
 }
 
-module.exports = Color;
+export { Color };
diff --git a/app/scripts/util/data/comparators.js b/app/scripts/util/data/comparators.js
index 6071a201..2f8ee7f1 100644
--- a/app/scripts/util/data/comparators.js
+++ b/app/scripts/util/data/comparators.js
@@ -37,4 +37,4 @@ const Comparators = {
     }
 };
 
-module.exports = Comparators;
+export { Comparators };
diff --git a/app/scripts/util/data/otp.js b/app/scripts/util/data/otp.js
index 6e5cc4c3..601f418a 100644
--- a/app/scripts/util/data/otp.js
+++ b/app/scripts/util/data/otp.js
@@ -1,4 +1,4 @@
-const Logger = require('../logger');
+import { Logger } from 'util/logger';
 
 const logger = new Logger('otp');
 
@@ -148,4 +148,4 @@ Otp.makeUrl = function(secret, period, digits) {
     );
 };
 
-module.exports = Otp;
+export { Otp };
diff --git a/app/scripts/util/data/ranking.js b/app/scripts/util/data/ranking.js
index e254017f..bb6b3703 100644
--- a/app/scripts/util/data/ranking.js
+++ b/app/scripts/util/data/ranking.js
@@ -33,4 +33,4 @@ function indexOf(target, search) {
 
 window.Ranking = Ranking;
 
-module.exports = Ranking;
+export { Ranking };
diff --git a/app/scripts/util/data/semver.js b/app/scripts/util/data/semver.js
index fb5a206d..204a81b0 100644
--- a/app/scripts/util/data/semver.js
+++ b/app/scripts/util/data/semver.js
@@ -16,4 +16,4 @@ const SemVer = {
     }
 };
 
-module.exports = SemVer;
+export { SemVer };
diff --git a/app/scripts/util/data/signature-verifier.js b/app/scripts/util/data/signature-verifier.js
index 2dc4ae2c..dbd20460 100644
--- a/app/scripts/util/data/signature-verifier.js
+++ b/app/scripts/util/data/signature-verifier.js
@@ -1,6 +1,6 @@
-const Logger = require('../logger');
-const publicKey = require('public-key.pem').default;
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
+import { Logger } from 'util/logger';
+import publicKey from 'public-key.pem';
 
 const SignatureVerifier = {
     logger: new Logger('signature-verifier'),
@@ -62,4 +62,4 @@ const SignatureVerifier = {
     }
 };
 
-module.exports = SignatureVerifier;
+export { SignatureVerifier };
diff --git a/app/scripts/util/features.js b/app/scripts/util/features.js
index c60d8a4f..281dcea0 100644
--- a/app/scripts/util/features.js
+++ b/app/scripts/util/features.js
@@ -37,4 +37,4 @@ const Features = {
     }
 };
 
-module.exports = Features;
+export { Features };
diff --git a/app/scripts/util/formatting/date-format.js b/app/scripts/util/formatting/date-format.js
index 39b9f2ab..982c8baf 100644
--- a/app/scripts/util/formatting/date-format.js
+++ b/app/scripts/util/formatting/date-format.js
@@ -1,5 +1,5 @@
-const Locale = require('../locale');
-const StringFormat = require('./string-format');
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
 
 const DateFormat = {
     dtStr(dt) {
@@ -46,4 +46,4 @@ const DateFormat = {
     }
 };
 
-module.exports = DateFormat;
+export { DateFormat };
diff --git a/app/scripts/util/formatting/icon-url-format.js b/app/scripts/util/formatting/icon-url-format.js
index 735583ad..61868936 100644
--- a/app/scripts/util/formatting/icon-url-format.js
+++ b/app/scripts/util/formatting/icon-url-format.js
@@ -1,4 +1,4 @@
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
 
 const IconUrlFormat = {
     toDataUrl(iconData) {
@@ -8,4 +8,4 @@ const IconUrlFormat = {
     }
 };
 
-module.exports = IconUrlFormat;
+export { IconUrlFormat };
diff --git a/app/scripts/util/formatting/md-to-html.js b/app/scripts/util/formatting/md-to-html.js
index bd7c73cc..c96dc64f 100644
--- a/app/scripts/util/formatting/md-to-html.js
+++ b/app/scripts/util/formatting/md-to-html.js
@@ -1,5 +1,5 @@
-const marked = require('marked');
-const dompurify = require('dompurify');
+import dompurify from 'dompurify';
+import marked from 'marked';
 
 const whiteSpaceRegex = /<\/?p>|<br>|\r|\n/g;
 
@@ -20,4 +20,4 @@ const MdToHtml = {
     }
 };
 
-module.exports = MdToHtml;
+export { MdToHtml };
diff --git a/app/scripts/util/formatting/string-format.js b/app/scripts/util/formatting/string-format.js
index 0e5d5af4..bad3033f 100644
--- a/app/scripts/util/formatting/string-format.js
+++ b/app/scripts/util/formatting/string-format.js
@@ -28,4 +28,4 @@ const StringFormat = {
     }
 };
 
-module.exports = StringFormat;
+export { StringFormat };
diff --git a/app/scripts/util/formatting/url-format.js b/app/scripts/util/formatting/url-format.js
index 7049fdcf..4d070d5c 100644
--- a/app/scripts/util/formatting/url-format.js
+++ b/app/scripts/util/formatting/url-format.js
@@ -25,4 +25,4 @@ const UrlFormat = {
     }
 };
 
-module.exports = UrlFormat;
+export { UrlFormat };
diff --git a/app/scripts/util/generators/id-generator.js b/app/scripts/util/generators/id-generator.js
index 57a1fc51..1ae39d87 100644
--- a/app/scripts/util/generators/id-generator.js
+++ b/app/scripts/util/generators/id-generator.js
@@ -10,4 +10,4 @@ const IdGenerator = {
     }
 };
 
-module.exports = IdGenerator;
+export { IdGenerator };
diff --git a/app/scripts/util/generators/password-generator.js b/app/scripts/util/generators/password-generator.js
index d1eaaa49..1e1629fc 100644
--- a/app/scripts/util/generators/password-generator.js
+++ b/app/scripts/util/generators/password-generator.js
@@ -1,5 +1,5 @@
-const kdbxweb = require('kdbxweb');
-const phonetic = require('./phonetic');
+import kdbxweb from 'kdbxweb';
+import { phonetic } from 'util/generators/phonetic';
 
 const PasswordGenerator = {
     charRanges: {
@@ -129,4 +129,4 @@ const PasswordGenerator = {
     }
 };
 
-module.exports = PasswordGenerator;
+export { PasswordGenerator };
diff --git a/app/scripts/util/generators/phonetic.js b/app/scripts/util/generators/phonetic.js
index 60abc9de..107ea062 100644
--- a/app/scripts/util/generators/phonetic.js
+++ b/app/scripts/util/generators/phonetic.js
@@ -320,4 +320,4 @@ function generate(options) {
 
 const phonetic = { generate };
 
-module.exports = phonetic;
+export { phonetic };
diff --git a/app/scripts/util/kdbxweb/kdbxweb-init.js b/app/scripts/util/kdbxweb/kdbxweb-init.js
index 95dddce4..9e981297 100644
--- a/app/scripts/util/kdbxweb/kdbxweb-init.js
+++ b/app/scripts/util/kdbxweb/kdbxweb-init.js
@@ -1,5 +1,5 @@
-const kdbxweb = require('kdbxweb');
-const Logger = require('../logger');
+import kdbxweb from 'kdbxweb';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('argon2');
 
@@ -168,4 +168,4 @@ const KdbxwebInit = {
     }
 };
 
-module.exports = KdbxwebInit;
+export { KdbxwebInit };
diff --git a/app/scripts/util/kdbxweb/protected-value-ex.js b/app/scripts/util/kdbxweb/protected-value-ex.js
index be968693..22deb9b0 100644
--- a/app/scripts/util/kdbxweb/protected-value-ex.js
+++ b/app/scripts/util/kdbxweb/protected-value-ex.js
@@ -1,4 +1,4 @@
-const kdbxweb = require('kdbxweb');
+import kdbxweb from 'kdbxweb';
 
 const ExpectedFieldRefChars = '{REF:0@I:00000000000000000000000000000000}'.split('');
 const ExpectedFieldRefByteLength = ExpectedFieldRefChars.length;
diff --git a/app/scripts/util/locale.js b/app/scripts/util/locale.js
index c96e16e0..784154ec 100644
--- a/app/scripts/util/locale.js
+++ b/app/scripts/util/locale.js
@@ -1,3 +1,3 @@
-const Locale = require('../locales/base.json');
+import Locale from 'locales/base.json';
 
-module.exports = Locale;
+export { Locale };
diff --git a/app/scripts/util/logger.js b/app/scripts/util/logger.js
index fd9c59ac..0cbfb8d6 100644
--- a/app/scripts/util/logger.js
+++ b/app/scripts/util/logger.js
@@ -81,4 +81,4 @@ Logger.getLast = function() {
 
 Logger.Level = Level;
 
-module.exports = Logger;
+export { Logger };
diff --git a/app/scripts/util/ui/file-saver.js b/app/scripts/util/ui/file-saver.js
index 12e4a002..0d8096d2 100644
--- a/app/scripts/util/ui/file-saver.js
+++ b/app/scripts/util/ui/file-saver.js
@@ -1,4 +1,4 @@
-const timeouts = require('../../const/timeouts');
+import { Timeouts } from 'const/timeouts';
 
 const FileSaver = {
     saveAs(blob, name) {
@@ -15,8 +15,8 @@ const FileSaver = {
 
         setTimeout(() => {
             URL.revokeObjectURL(link.href);
-        }, timeouts.LinkDownloadRevoke);
+        }, Timeouts.LinkDownloadRevoke);
     }
 };
 
-module.exports = FileSaver;
+export { FileSaver };
diff --git a/app/scripts/util/ui/input-fx.js b/app/scripts/util/ui/input-fx.js
index df719b95..3f87efbd 100644
--- a/app/scripts/util/ui/input-fx.js
+++ b/app/scripts/util/ui/input-fx.js
@@ -5,4 +5,4 @@ const InputFx = {
     }
 };
 
-module.exports = InputFx;
+export { InputFx };
diff --git a/app/scripts/util/ui/tip.js b/app/scripts/util/ui/tip.js
index b134478a..cc5254cd 100644
--- a/app/scripts/util/ui/tip.js
+++ b/app/scripts/util/ui/tip.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const Features = require('../features');
+import Backbone from 'backbone';
+import { Features } from 'util/features';
 
 const Tip = function(el, config) {
     this.el = el;
@@ -180,4 +180,4 @@ Tip.updateTip = function(el, props) {
     }
 };
 
-module.exports = Tip;
+export { Tip };
diff --git a/app/scripts/view-engine/backbone-view-ext.js b/app/scripts/view-engine/backbone-view-ext.js
index 62bb1cdc..c5a8a61e 100644
--- a/app/scripts/view-engine/backbone-view-ext.js
+++ b/app/scripts/view-engine/backbone-view-ext.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const Tip = require('../util/ui/tip');
+import Backbone from 'backbone';
+import { Tip } from 'util/ui/tip';
 
 _.extend(Backbone.View.prototype, {
     hide() {
diff --git a/app/scripts/view-engine/copyable.js b/app/scripts/view-engine/copyable.js
index 17b4c21c..285a4bb6 100644
--- a/app/scripts/view-engine/copyable.js
+++ b/app/scripts/view-engine/copyable.js
@@ -1,10 +1,8 @@
-const AppSettingsModel = require('../models/app-settings-model');
-const Backbone = require('backbone');
-
-const Locale = require('../util/locale');
-
-const Tip = require('../util/ui/tip');
-const Timeouts = require('../const/timeouts');
+import Backbone from 'backbone';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Locale } from 'util/locale';
+import { Tip } from 'util/ui/tip';
+import { Timeouts } from 'const/timeouts';
 
 const Copyable = {
     hideFieldCopyTip() {
@@ -50,4 +48,4 @@ const Copyable = {
     }
 };
 
-module.exports = Copyable;
+export { Copyable };
diff --git a/app/scripts/view-engine/resizable.js b/app/scripts/view-engine/resizable.js
index 3aab23cf..9db57863 100644
--- a/app/scripts/view-engine/resizable.js
+++ b/app/scripts/view-engine/resizable.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const Resizable = {
     listenDrag(dragView) {
@@ -66,4 +66,4 @@ const Resizable = {
     }
 };
 
-module.exports = Resizable;
+export { Resizable };
diff --git a/app/scripts/view-engine/scrollable.js b/app/scripts/view-engine/scrollable.js
index 0ad6100f..a9605a89 100644
--- a/app/scripts/view-engine/scrollable.js
+++ b/app/scripts/view-engine/scrollable.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Features = require('../util/features');
-const baron = require('baron');
+import Backbone from 'backbone';
+import baron from 'baron';
+import { Features } from 'util/features';
 
 const isEnabled = !Features.isMobile;
 
@@ -51,4 +51,4 @@ const Scrollable = {
     }
 };
 
-module.exports = Scrollable;
+export { Scrollable };
diff --git a/app/scripts/views/app-view.js b/app/scripts/views/app-view.js
index a93611ca..ab8a787a 100644
--- a/app/scripts/views/app-view.js
+++ b/app/scripts/views/app-view.js
@@ -1,27 +1,27 @@
-const Backbone = require('backbone');
-const DragView = require('../views/drag-view');
-const MenuView = require('../views/menu/menu-view');
-const FooterView = require('../views/footer-view');
-const ListView = require('../views/list-view');
-const ListWrapView = require('../views/list-wrap-view');
-const DetailsView = require('../views/details/details-view');
-const GrpView = require('../views/grp-view');
-const TagView = require('../views/tag-view');
-const GeneratorPresetsView = require('../views/generator-presets-view');
-const OpenView = require('../views/open-view');
-const SettingsView = require('../views/settings/settings-view');
-const KeyChangeView = require('../views/key-change-view');
-const DropdownView = require('../views/dropdown-view');
-const Alerts = require('../comp/ui/alerts');
-const Keys = require('../const/keys');
-const Timeouts = require('../const/timeouts');
-const KeyHandler = require('../comp/browser/key-handler');
-const IdleTracker = require('../comp/browser/idle-tracker');
-const Launcher = require('../comp/launcher');
-const SettingsManager = require('../comp/settings/settings-manager');
-const Locale = require('../util/locale');
-const Features = require('../util/features');
-const UpdateModel = require('../models/update-model');
+import Backbone from 'backbone';
+import { IdleTracker } from 'comp/browser/idle-tracker';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Launcher } from 'comp/launcher';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { Alerts } from 'comp/ui/alerts';
+import { Keys } from 'const/keys';
+import { Timeouts } from 'const/timeouts';
+import { UpdateModel } from 'models/update-model';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
+import { DetailsView } from 'views/details/details-view';
+import { DragView } from 'views/drag-view';
+import { DropdownView } from 'views/dropdown-view';
+import { FooterView } from 'views/footer-view';
+import { GeneratorPresetsView } from 'views/generator-presets-view';
+import { GrpView } from 'views/grp-view';
+import { KeyChangeView } from 'views/key-change-view';
+import { ListView } from 'views/list-view';
+import { ListWrapView } from 'views/list-wrap-view';
+import { MenuView } from 'views/menu/menu-view';
+import { OpenView } from 'views/open-view';
+import { SettingsView } from 'views/settings/settings-view';
+import { TagView } from 'views/tag-view';
 
 const AppView = Backbone.View.extend({
     el: 'body',
@@ -785,4 +785,4 @@ const AppView = Backbone.View.extend({
     }
 });
 
-module.exports = AppView;
+export { AppView };
diff --git a/app/scripts/views/auto-type-hint-view.js b/app/scripts/views/auto-type-hint-view.js
index a4fbdeb7..c5ef309e 100644
--- a/app/scripts/views/auto-type-hint-view.js
+++ b/app/scripts/views/auto-type-hint-view.js
@@ -1,7 +1,7 @@
-const Backbone = require('backbone');
-const Features = require('../util/features');
-const Links = require('../const/links');
-const Timeouts = require('../const/timeouts');
+import Backbone from 'backbone';
+import { Links } from 'const/links';
+import { Timeouts } from 'const/timeouts';
+import { Features } from 'util/features';
 
 const AutoTypeHintView = Backbone.View.extend({
     template: require('templates/auto-type-hint.hbs'),
@@ -80,4 +80,4 @@ const AutoTypeHintView = Backbone.View.extend({
     }
 });
 
-module.exports = AutoTypeHintView;
+export { AutoTypeHintView };
diff --git a/app/scripts/views/auto-type/auto-type-select-view.js b/app/scripts/views/auto-type/auto-type-select-view.js
index 0a44e699..8efe7c84 100644
--- a/app/scripts/views/auto-type/auto-type-select-view.js
+++ b/app/scripts/views/auto-type/auto-type-select-view.js
@@ -1,15 +1,15 @@
-const Backbone = require('backbone');
-const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/browser/key-handler');
-const Locale = require('../../util/locale');
-const AppSettingsModel = require('../../models/app-settings-model');
-const EntryPresenter = require('../../presenters/entry-presenter');
-const Scrollable = require('../../view-engine/scrollable');
-const Shortcuts = require('../../comp/app/shortcuts');
-const DropdownView = require('../dropdown-view');
-const StringFormat = require('../../util/formatting/string-format');
+import Backbone from 'backbone';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { EntryPresenter } from 'presenters/entry-presenter';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
+import { Scrollable } from 'view-engine/scrollable';
+import { DropdownView } from 'views/dropdown-view';
 
-const AutoTypePopupView = Backbone.View.extend({
+const AutoTypeSelectView = Backbone.View.extend({
     el: 'body',
 
     template: require('templates/auto-type/auto-type-select.hbs'),
@@ -343,6 +343,6 @@ const AutoTypePopupView = Backbone.View.extend({
     }
 });
 
-_.extend(AutoTypePopupView.prototype, Scrollable);
+_.extend(AutoTypeSelectView.prototype, Scrollable);
 
-module.exports = AutoTypePopupView;
+export { AutoTypeSelectView };
diff --git a/app/scripts/views/details/details-add-field-view.js b/app/scripts/views/details/details-add-field-view.js
index a22faab8..64de7636 100644
--- a/app/scripts/views/details/details-add-field-view.js
+++ b/app/scripts/views/details/details-add-field-view.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const DetailsAddFieldView = Backbone.View.extend({
     template: require('templates/details/details-add-field.hbs'),
@@ -23,4 +23,4 @@ const DetailsAddFieldView = Backbone.View.extend({
     }
 });
 
-module.exports = DetailsAddFieldView;
+export { DetailsAddFieldView };
diff --git a/app/scripts/views/details/details-attachment-view.js b/app/scripts/views/details/details-attachment-view.js
index 59f18ee2..531dccb3 100644
--- a/app/scripts/views/details/details-attachment-view.js
+++ b/app/scripts/views/details/details-attachment-view.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const Shortcuts = require('../../comp/app/shortcuts');
+import Backbone from 'backbone';
+import { Shortcuts } from 'comp/app/shortcuts';
 
 const DetailsAttachmentView = Backbone.View.extend({
     template: require('templates/details/details-attachment.hbs'),
@@ -38,4 +38,4 @@ const DetailsAttachmentView = Backbone.View.extend({
     }
 });
 
-module.exports = DetailsAttachmentView;
+export { DetailsAttachmentView };
diff --git a/app/scripts/views/details/details-auto-type-view.js b/app/scripts/views/details/details-auto-type-view.js
index 8ad7fbfb..07bde292 100644
--- a/app/scripts/views/details/details-auto-type-view.js
+++ b/app/scripts/views/details/details-auto-type-view.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const AutoTypeHintView = require('../auto-type-hint-view');
-const Locale = require('../../util/locale');
-const Shortcuts = require('../../comp/app/shortcuts');
-const AutoType = require('../../auto-type');
+import { AutoType } from 'auto-type';
+import Backbone from 'backbone';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { Locale } from 'util/locale';
+import { AutoTypeHintView } from 'views/auto-type-hint-view';
 
 const DetailsAutoTypeView = Backbone.View.extend({
     template: require('templates/details/details-auto-type.hbs'),
@@ -72,4 +72,4 @@ const DetailsAutoTypeView = Backbone.View.extend({
     }
 });
 
-module.exports = DetailsAutoTypeView;
+export { DetailsAutoTypeView };
diff --git a/app/scripts/views/details/details-history-view.js b/app/scripts/views/details/details-history-view.js
index f6c2426c..497bef06 100644
--- a/app/scripts/views/details/details-history-view.js
+++ b/app/scripts/views/details/details-history-view.js
@@ -1,13 +1,13 @@
-const Backbone = require('backbone');
-const KeyHandler = require('../../comp/browser/key-handler');
-const Keys = require('../../const/keys');
-const DateFormat = require('../../util/formatting/date-format');
-const StringFormat = require('../../util/formatting/string-format');
-const Locale = require('../../util/locale');
-const Alerts = require('../../comp/ui/alerts');
-const FieldViewReadOnly = require('../fields/field-view-read-only');
-const FieldViewReadOnlyRaw = require('../fields/field-view-read-only-raw');
-const Copyable = require('../../view-engine/copyable');
+import Backbone from 'backbone';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Alerts } from 'comp/ui/alerts';
+import { Keys } from 'const/keys';
+import { DateFormat } from 'util/formatting/date-format';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
+import { Copyable } from 'view-engine/copyable';
+import { FieldViewReadOnly } from 'views/fields/field-view-read-only';
+import { FieldViewReadOnlyRaw } from 'views/fields/field-view-read-only-raw';
 
 const DetailsHistoryView = Backbone.View.extend({
     template: require('templates/details/details-history.hbs'),
@@ -363,4 +363,4 @@ const DetailsHistoryView = Backbone.View.extend({
 
 _.extend(DetailsHistoryView.prototype, Copyable);
 
-module.exports = DetailsHistoryView;
+export { DetailsHistoryView };
diff --git a/app/scripts/views/details/details-view.js b/app/scripts/views/details/details-view.js
index b3cbdb48..1e64c3e0 100644
--- a/app/scripts/views/details/details-view.js
+++ b/app/scripts/views/details/details-view.js
@@ -1,38 +1,38 @@
-const Backbone = require('backbone');
-const kdbxweb = require('kdbxweb');
-const GroupModel = require('../../models/group-model');
-const AppSettingsModel = require('../../models/app-settings-model');
-const Scrollable = require('../../view-engine/scrollable');
-const FieldViewText = require('../fields/field-view-text');
-const FieldViewSelect = require('../fields/field-view-select');
-const FieldViewAutocomplete = require('../fields/field-view-autocomplete');
-const FieldViewDate = require('../fields/field-view-date');
-const FieldViewTags = require('../fields/field-view-tags');
-const FieldViewUrl = require('../fields/field-view-url');
-const FieldViewReadOnly = require('../fields/field-view-read-only');
-const FieldViewHistory = require('../fields/field-view-history');
-const FieldViewCustom = require('../fields/field-view-custom');
-const FieldViewOtp = require('../fields/field-view-otp');
-const IconSelectView = require('../icon-select-view');
-const DetailsHistoryView = require('./details-history-view');
-const DetailsAttachmentView = require('./details-attachment-view');
-const DetailsAddFieldView = require('./details-add-field-view');
-const DetailsAutoTypeView = require('./details-auto-type-view');
-const DropdownView = require('../../views/dropdown-view');
-const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/browser/key-handler');
-const Alerts = require('../../comp/ui/alerts');
-const CopyPaste = require('../../comp/browser/copy-paste');
-const OtpQrReader = require('../../comp/format/otp-qr-reader');
-const AutoType = require('../../auto-type');
-const StringFormat = require('../../util/formatting/string-format');
-const DateFormat = require('../../util/formatting/date-format');
-const Locale = require('../../util/locale');
-const Tip = require('../../util/ui/tip');
-const FileSaver = require('../../util/ui/file-saver');
-const Features = require('../../util/features');
-const Timeouts = require('../../const/timeouts');
-const Copyable = require('../../view-engine/copyable');
+import { AutoType } from 'auto-type';
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { CopyPaste } from 'comp/browser/copy-paste';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { OtpQrReader } from 'comp/format/otp-qr-reader';
+import { Alerts } from 'comp/ui/alerts';
+import { Keys } from 'const/keys';
+import { Timeouts } from 'const/timeouts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { GroupModel } from 'models/group-model';
+import { Features } from 'util/features';
+import { DateFormat } from 'util/formatting/date-format';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
+import { FileSaver } from 'util/ui/file-saver';
+import { Tip } from 'util/ui/tip';
+import { Copyable } from 'view-engine/copyable';
+import { Scrollable } from 'view-engine/scrollable';
+import { DetailsAddFieldView } from 'views/details/details-add-field-view';
+import { DetailsAttachmentView } from 'views/details/details-attachment-view';
+import { DetailsAutoTypeView } from 'views/details/details-auto-type-view';
+import { DetailsHistoryView } from 'views/details/details-history-view';
+import { DropdownView } from 'views/dropdown-view';
+import { FieldViewAutocomplete } from 'views/fields/field-view-autocomplete';
+import { FieldViewCustom } from 'views/fields/field-view-custom';
+import { FieldViewDate } from 'views/fields/field-view-date';
+import { FieldViewHistory } from 'views/fields/field-view-history';
+import { FieldViewOtp } from 'views/fields/field-view-otp';
+import { FieldViewReadOnly } from 'views/fields/field-view-read-only';
+import { FieldViewSelect } from 'views/fields/field-view-select';
+import { FieldViewTags } from 'views/fields/field-view-tags';
+import { FieldViewText } from 'views/fields/field-view-text';
+import { FieldViewUrl } from 'views/fields/field-view-url';
+import { IconSelectView } from 'views/icon-select-view';
 
 const DetailsView = Backbone.View.extend({
     template: require('templates/details/details.hbs'),
@@ -1107,4 +1107,4 @@ const DetailsView = Backbone.View.extend({
 _.extend(DetailsView.prototype, Scrollable);
 _.extend(DetailsView.prototype, Copyable);
 
-module.exports = DetailsView;
+export { DetailsView };
diff --git a/app/scripts/views/drag-view.js b/app/scripts/views/drag-view.js
index 66a2a368..31b175ca 100644
--- a/app/scripts/views/drag-view.js
+++ b/app/scripts/views/drag-view.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const DragView = Backbone.View.extend({
     events: {
@@ -62,4 +62,4 @@ const DragView = Backbone.View.extend({
     }
 });
 
-module.exports = DragView;
+export { DragView };
diff --git a/app/scripts/views/dropdown-view.js b/app/scripts/views/dropdown-view.js
index efa82491..09d52bb3 100644
--- a/app/scripts/views/dropdown-view.js
+++ b/app/scripts/views/dropdown-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Keys = require('../const/keys');
-const KeyHandler = require('../comp/browser/key-handler');
+import Backbone from 'backbone';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
 
 const DropdownView = Backbone.View.extend({
     template: require('templates/dropdown.hbs'),
@@ -123,4 +123,4 @@ const DropdownView = Backbone.View.extend({
     }
 });
 
-module.exports = DropdownView;
+export { DropdownView };
diff --git a/app/scripts/views/fields/field-view-autocomplete.js b/app/scripts/views/fields/field-view-autocomplete.js
index 8902a91f..4c437e9f 100644
--- a/app/scripts/views/fields/field-view-autocomplete.js
+++ b/app/scripts/views/fields/field-view-autocomplete.js
@@ -1,5 +1,5 @@
-const FieldViewText = require('./field-view-text');
-const Keys = require('../../const/keys');
+import { Keys } from 'const/keys';
+import { FieldViewText } from 'views/fields/field-view-text';
 
 const FieldViewAutocomplete = FieldViewText.extend({
     endEdit(newVal, extra) {
@@ -109,4 +109,4 @@ const FieldViewAutocomplete = FieldViewText.extend({
     }
 });
 
-module.exports = FieldViewAutocomplete;
+export { FieldViewAutocomplete };
diff --git a/app/scripts/views/fields/field-view-custom.js b/app/scripts/views/fields/field-view-custom.js
index 2eb9d27b..4c6945a0 100644
--- a/app/scripts/views/fields/field-view-custom.js
+++ b/app/scripts/views/fields/field-view-custom.js
@@ -1,10 +1,10 @@
-const Backbone = require('backbone');
-const FieldViewText = require('./field-view-text');
-const FieldView = require('./field-view');
-const Keys = require('../../const/keys');
-const kdbxweb = require('kdbxweb');
-const Tip = require('../../util/ui/tip');
-const Locale = require('../../util/locale');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { Keys } from 'const/keys';
+import { Locale } from 'util/locale';
+import { Tip } from 'util/ui/tip';
+import { FieldView } from 'views/fields/field-view';
+import { FieldViewText } from 'views/fields/field-view-text';
 
 const FieldViewCustom = FieldViewText.extend({
     events: {
@@ -160,4 +160,4 @@ const FieldViewCustom = FieldViewText.extend({
     }
 });
 
-module.exports = FieldViewCustom;
+export { FieldViewCustom };
diff --git a/app/scripts/views/fields/field-view-date.js b/app/scripts/views/fields/field-view-date.js
index 6839cb50..2e6ba4f7 100644
--- a/app/scripts/views/fields/field-view-date.js
+++ b/app/scripts/views/fields/field-view-date.js
@@ -1,7 +1,7 @@
-const FieldViewText = require('./field-view-text');
-const Locale = require('../../util/locale');
-const Pikaday = require('pikaday');
-const DateFormat = require('../../util/formatting/date-format');
+import { Pikaday } from 'pikaday';
+import { DateFormat } from 'util/formatting/date-format';
+import { Locale } from 'util/locale';
+import { FieldViewText } from 'views/fields/field-view-text';
 
 const FieldViewDate = FieldViewText.extend({
     renderValue(value) {
@@ -78,4 +78,4 @@ const FieldViewDate = FieldViewText.extend({
     }
 });
 
-module.exports = FieldViewDate;
+export { FieldViewDate };
diff --git a/app/scripts/views/fields/field-view-history.js b/app/scripts/views/fields/field-view-history.js
index 5edb7959..aba25819 100644
--- a/app/scripts/views/fields/field-view-history.js
+++ b/app/scripts/views/fields/field-view-history.js
@@ -1,5 +1,5 @@
-const FieldView = require('./field-view');
-const Locale = require('../../util/locale');
+import { Locale } from 'util/locale';
+import { FieldView } from 'views/fields/field-view';
 
 const FieldViewHistory = FieldView.extend({
     renderValue(value) {
@@ -19,4 +19,4 @@ const FieldViewHistory = FieldView.extend({
     readonly: true
 });
 
-module.exports = FieldViewHistory;
+export { FieldViewHistory };
diff --git a/app/scripts/views/fields/field-view-otp.js b/app/scripts/views/fields/field-view-otp.js
index 477ce6b4..1526a022 100644
--- a/app/scripts/views/fields/field-view-otp.js
+++ b/app/scripts/views/fields/field-view-otp.js
@@ -1,5 +1,5 @@
-const FieldViewText = require('./field-view-text');
-const Timeouts = require('../../const/timeouts');
+import { Timeouts } from 'const/timeouts';
+import { FieldViewText } from 'views/fields/field-view-text';
 
 const MinOpacity = 0.1;
 
@@ -100,4 +100,4 @@ const FieldViewOtp = FieldViewText.extend({
     }
 });
 
-module.exports = FieldViewOtp;
+export { FieldViewOtp };
diff --git a/app/scripts/views/fields/field-view-read-only-raw.js b/app/scripts/views/fields/field-view-read-only-raw.js
index 61f0a500..a1cb024b 100644
--- a/app/scripts/views/fields/field-view-read-only-raw.js
+++ b/app/scripts/views/fields/field-view-read-only-raw.js
@@ -1,4 +1,4 @@
-const FieldView = require('./field-view');
+import { FieldView } from 'views/fields/field-view';
 
 const FieldViewReadOnlyRaw = FieldView.extend({
     renderValue(value) {
@@ -8,4 +8,4 @@ const FieldViewReadOnlyRaw = FieldView.extend({
     readonly: true
 });
 
-module.exports = FieldViewReadOnlyRaw;
+export { FieldViewReadOnlyRaw };
diff --git a/app/scripts/views/fields/field-view-read-only.js b/app/scripts/views/fields/field-view-read-only.js
index 2542d43c..c195da41 100644
--- a/app/scripts/views/fields/field-view-read-only.js
+++ b/app/scripts/views/fields/field-view-read-only.js
@@ -1,4 +1,4 @@
-const FieldView = require('./field-view');
+import { FieldView } from 'views/fields/field-view';
 
 const FieldViewReadOnly = FieldView.extend({
     renderValue(value) {
@@ -10,4 +10,4 @@ const FieldViewReadOnly = FieldView.extend({
     readonly: true
 });
 
-module.exports = FieldViewReadOnly;
+export { FieldViewReadOnly };
diff --git a/app/scripts/views/fields/field-view-select.js b/app/scripts/views/fields/field-view-select.js
index 41e4dcc8..f82c09ad 100644
--- a/app/scripts/views/fields/field-view-select.js
+++ b/app/scripts/views/fields/field-view-select.js
@@ -1,4 +1,4 @@
-const FieldView = require('./field-view');
+import { FieldView } from 'views/fields/field-view';
 
 const FieldViewSelect = FieldView.extend({
     readonly: true,
@@ -49,4 +49,4 @@ const FieldViewSelect = FieldView.extend({
     }
 });
 
-module.exports = FieldViewSelect;
+export { FieldViewSelect };
diff --git a/app/scripts/views/fields/field-view-tags.js b/app/scripts/views/fields/field-view-tags.js
index 33202288..78b5dfe3 100644
--- a/app/scripts/views/fields/field-view-tags.js
+++ b/app/scripts/views/fields/field-view-tags.js
@@ -1,4 +1,4 @@
-const FieldViewText = require('./field-view-text');
+import { FieldViewText } from 'views/fields/field-view-text';
 
 const FieldViewTags = FieldViewText.extend({
     renderValue(value) {
@@ -107,4 +107,4 @@ const FieldViewTags = FieldViewText.extend({
     }
 });
 
-module.exports = FieldViewTags;
+export { FieldViewTags };
diff --git a/app/scripts/views/fields/field-view-text.js b/app/scripts/views/fields/field-view-text.js
index 452d3800..29d04f05 100644
--- a/app/scripts/views/fields/field-view-text.js
+++ b/app/scripts/views/fields/field-view-text.js
@@ -1,13 +1,13 @@
-const Backbone = require('backbone');
-const kdbxweb = require('kdbxweb');
-const FieldView = require('./field-view');
-const GeneratorView = require('../generator-view');
-const KeyHandler = require('../../comp/browser/key-handler');
-const Keys = require('../../const/keys');
-const PasswordGenerator = require('../../util/generators/password-generator');
-const Features = require('../../util/features');
-const Tip = require('../../util/ui/tip');
-const MdToHtml = require('../../util/formatting/md-to-html');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
+import { Features } from 'util/features';
+import { MdToHtml } from 'util/formatting/md-to-html';
+import { PasswordGenerator } from 'util/generators/password-generator';
+import { Tip } from 'util/ui/tip';
+import { FieldView } from 'views/fields/field-view';
+import { GeneratorView } from 'views/generator-view';
 
 const FieldViewText = FieldView.extend({
     renderValue(value) {
@@ -265,4 +265,4 @@ const FieldViewText = FieldView.extend({
     }
 });
 
-module.exports = FieldViewText;
+export { FieldViewText };
diff --git a/app/scripts/views/fields/field-view-url.js b/app/scripts/views/fields/field-view-url.js
index 8e497490..97344a1f 100644
--- a/app/scripts/views/fields/field-view-url.js
+++ b/app/scripts/views/fields/field-view-url.js
@@ -1,4 +1,4 @@
-const FieldViewText = require('./field-view-text');
+import { FieldViewText } from 'views/fields/field-view-text';
 
 const FieldViewUrl = FieldViewText.extend({
     displayUrlRegex: /^https:\/\//i,
@@ -23,4 +23,4 @@ const FieldViewUrl = FieldViewText.extend({
     }
 });
 
-module.exports = FieldViewUrl;
+export { FieldViewUrl };
diff --git a/app/scripts/views/fields/field-view.js b/app/scripts/views/fields/field-view.js
index 25727ab0..72aa6ec2 100644
--- a/app/scripts/views/fields/field-view.js
+++ b/app/scripts/views/fields/field-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const CopyPaste = require('../../comp/browser/copy-paste');
-const Tip = require('../../util/ui/tip');
+import Backbone from 'backbone';
+import { CopyPaste } from 'comp/browser/copy-paste';
+import { Tip } from 'util/ui/tip';
 
 const FieldView = Backbone.View.extend({
     template: require('templates/details/field.hbs'),
@@ -167,4 +167,4 @@ const FieldView = Backbone.View.extend({
     }
 });
 
-module.exports = FieldView;
+export { FieldView };
diff --git a/app/scripts/views/footer-view.js b/app/scripts/views/footer-view.js
index 91ed5296..3be5ccc5 100644
--- a/app/scripts/views/footer-view.js
+++ b/app/scripts/views/footer-view.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const Keys = require('../const/keys');
-const KeyHandler = require('../comp/browser/key-handler');
-const GeneratorView = require('./generator-view');
-const UpdateModel = require('../models/update-model');
+import Backbone from 'backbone';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
+import { UpdateModel } from 'models/update-model';
+import { GeneratorView } from 'views/generator-view';
 
 const FooterView = Backbone.View.extend({
     template: require('templates/footer.hbs'),
@@ -110,4 +110,4 @@ const FooterView = Backbone.View.extend({
     }
 });
 
-module.exports = FooterView;
+export { FooterView };
diff --git a/app/scripts/views/generator-presets-view.js b/app/scripts/views/generator-presets-view.js
index 0adf45cf..53940b97 100644
--- a/app/scripts/views/generator-presets-view.js
+++ b/app/scripts/views/generator-presets-view.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const Scrollable = require('../view-engine/scrollable');
-const Locale = require('../util/locale');
-const GeneratorPresets = require('../comp/app/generator-presets');
-const PasswordGenerator = require('../util/generators/password-generator');
+import Backbone from 'backbone';
+import { GeneratorPresets } from 'comp/app/generator-presets';
+import { PasswordGenerator } from 'util/generators/password-generator';
+import { Locale } from 'util/locale';
+import { Scrollable } from 'view-engine/scrollable';
 
 const GeneratorPresetsView = Backbone.View.extend({
     template: require('templates/generator-presets.hbs'),
@@ -183,4 +183,4 @@ const GeneratorPresetsView = Backbone.View.extend({
 
 _.extend(GeneratorPresetsView.prototype, Scrollable);
 
-module.exports = GeneratorPresetsView;
+export { GeneratorPresetsView };
diff --git a/app/scripts/views/generator-view.js b/app/scripts/views/generator-view.js
index ae754432..6e96964a 100644
--- a/app/scripts/views/generator-view.js
+++ b/app/scripts/views/generator-view.js
@@ -1,10 +1,10 @@
-const Backbone = require('backbone');
-const PasswordGenerator = require('../util/generators/password-generator');
-const CopyPaste = require('../comp/browser/copy-paste');
-const AppSettingsModel = require('../models/app-settings-model');
-const GeneratorPresets = require('../comp/app/generator-presets');
-const Locale = require('../util/locale');
-const Tip = require('../util/ui/tip');
+import Backbone from 'backbone';
+import { GeneratorPresets } from 'comp/app/generator-presets';
+import { CopyPaste } from 'comp/browser/copy-paste';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { PasswordGenerator } from 'util/generators/password-generator';
+import { Locale } from 'util/locale';
+import { Tip } from 'util/ui/tip';
 
 const GeneratorView = Backbone.View.extend({
     el: 'body',
@@ -199,4 +199,4 @@ const GeneratorView = Backbone.View.extend({
     }
 });
 
-module.exports = GeneratorView;
+export { GeneratorView };
diff --git a/app/scripts/views/grp-view.js b/app/scripts/views/grp-view.js
index 725e9b47..7240cd31 100644
--- a/app/scripts/views/grp-view.js
+++ b/app/scripts/views/grp-view.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const Scrollable = require('../view-engine/scrollable');
-const IconSelectView = require('./icon-select-view');
-const AutoTypeHintView = require('./auto-type-hint-view');
-const AutoType = require('../auto-type');
+import { AutoType } from 'auto-type';
+import Backbone from 'backbone';
+import { Scrollable } from 'view-engine/scrollable';
+import { AutoTypeHintView } from 'views/auto-type-hint-view';
+import { IconSelectView } from 'views/icon-select-view';
 
 const GrpView = Backbone.View.extend({
     template: require('templates/grp.hbs'),
@@ -142,4 +142,4 @@ const GrpView = Backbone.View.extend({
 
 _.extend(GrpView.prototype, Scrollable);
 
-module.exports = GrpView;
+export { GrpView };
diff --git a/app/scripts/views/icon-select-view.js b/app/scripts/views/icon-select-view.js
index 5194a71e..321b440e 100644
--- a/app/scripts/views/icon-select-view.js
+++ b/app/scripts/views/icon-select-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const IconMap = require('../const/icon-map');
-const Logger = require('../util/logger');
+import Backbone from 'backbone';
+import { IconMap } from 'const/icon-map';
+import { Logger } from 'util/logger';
 
 const logger = new Logger('icon-select-view');
 
@@ -143,4 +143,4 @@ const IconSelectView = Backbone.View.extend({
     }
 });
 
-module.exports = IconSelectView;
+export { IconSelectView };
diff --git a/app/scripts/views/key-change-view.js b/app/scripts/views/key-change-view.js
index 301ac74e..26dd79f9 100644
--- a/app/scripts/views/key-change-view.js
+++ b/app/scripts/views/key-change-view.js
@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const SecureInput = require('../comp/browser/secure-input');
-const Alerts = require('../comp/ui/alerts');
-const Locale = require('../util/locale');
-const InputFx = require('../util/ui/input-fx');
-const Keys = require('../const/keys');
+import Backbone from 'backbone';
+import { SecureInput } from 'comp/browser/secure-input';
+import { Alerts } from 'comp/ui/alerts';
+import { Keys } from 'const/keys';
+import { Locale } from 'util/locale';
+import { InputFx } from 'util/ui/input-fx';
 
 const KeyChangeView = Backbone.View.extend({
     template: require('templates/key-change.hbs'),
@@ -126,4 +126,4 @@ const KeyChangeView = Backbone.View.extend({
     }
 });
 
-module.exports = KeyChangeView;
+export { KeyChangeView };
diff --git a/app/scripts/views/list-search-view.js b/app/scripts/views/list-search-view.js
index d770ab16..6743bf29 100644
--- a/app/scripts/views/list-search-view.js
+++ b/app/scripts/views/list-search-view.js
@@ -1,12 +1,12 @@
-const Backbone = require('backbone');
-const Keys = require('../const/keys');
-const KeyHandler = require('../comp/browser/key-handler');
-const DropdownView = require('./dropdown-view');
-const Features = require('../util/features');
-const Shortcuts = require('../comp/app/shortcuts');
-const StringFormat = require('../util/formatting/string-format');
-const Locale = require('../util/locale');
-const Comparators = require('../util/data/comparators');
+import Backbone from 'backbone';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
+import { Comparators } from 'util/data/comparators';
+import { Features } from 'util/features';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
+import { DropdownView } from 'views/dropdown-view';
 
 const ListSearchView = Backbone.View.extend({
     template: require('templates/list-search.hbs'),
@@ -421,4 +421,4 @@ const ListSearchView = Backbone.View.extend({
     }
 });
 
-module.exports = ListSearchView;
+export { ListSearchView };
diff --git a/app/scripts/views/list-view.js b/app/scripts/views/list-view.js
index 6f8e31ff..e5050381 100644
--- a/app/scripts/views/list-view.js
+++ b/app/scripts/views/list-view.js
@@ -1,15 +1,15 @@
-const Backbone = require('backbone');
-const EntryCollection = require('../collections/entry-collection');
-const Resizable = require('../view-engine/resizable');
-const Scrollable = require('../view-engine/scrollable');
-const ListSearchView = require('./list-search-view');
-const DropdownView = require('./dropdown-view');
-const EntryPresenter = require('../presenters/entry-presenter');
-const DragDropInfo = require('../comp/app/drag-drop-info');
-const AppSettingsModel = require('../models/app-settings-model');
-const Locale = require('../util/locale');
-const StringFormat = require('../util/formatting/string-format');
-const Alerts = require('../comp/ui/alerts');
+import Backbone from 'backbone';
+import { EntryCollection } from 'collections/entry-collection';
+import { DragDropInfo } from 'comp/app/drag-drop-info';
+import { Alerts } from 'comp/ui/alerts';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { EntryPresenter } from 'presenters/entry-presenter';
+import { StringFormat } from 'util/formatting/string-format';
+import { Locale } from 'util/locale';
+import { Resizable } from 'view-engine/resizable';
+import { Scrollable } from 'view-engine/scrollable';
+import { DropdownView } from 'views/dropdown-view';
+import { ListSearchView } from 'views/list-search-view';
 
 const ListView = Backbone.View.extend({
     template: require('templates/list.hbs'),
@@ -324,4 +324,4 @@ const ListView = Backbone.View.extend({
 _.extend(ListView.prototype, Resizable);
 _.extend(ListView.prototype, Scrollable);
 
-module.exports = ListView;
+export { ListView };
diff --git a/app/scripts/views/list-wrap-view.js b/app/scripts/views/list-wrap-view.js
index 4207755b..9a8efc98 100644
--- a/app/scripts/views/list-wrap-view.js
+++ b/app/scripts/views/list-wrap-view.js
@@ -1,4 +1,4 @@
-const Backbone = require('backbone');
+import Backbone from 'backbone';
 
 const ListWrapView = Backbone.View.extend({
     events: {},
@@ -17,4 +17,4 @@ const ListWrapView = Backbone.View.extend({
     }
 });
 
-module.exports = ListWrapView;
+export { ListWrapView };
diff --git a/app/scripts/views/menu/menu-item-view.js b/app/scripts/views/menu/menu-item-view.js
index 037275e3..2d60f960 100644
--- a/app/scripts/views/menu/menu-item-view.js
+++ b/app/scripts/views/menu/menu-item-view.js
@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const KeyHandler = require('../../comp/browser/key-handler');
-const Keys = require('../../const/keys');
-const Alerts = require('../../comp/ui/alerts');
-const DragDropInfo = require('../../comp/app/drag-drop-info');
-const Locale = require('../../util/locale');
+import Backbone from 'backbone';
+import { DragDropInfo } from 'comp/app/drag-drop-info';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Alerts } from 'comp/ui/alerts';
+import { Keys } from 'const/keys';
+import { Locale } from 'util/locale';
 
 const MenuItemView = Backbone.View.extend({
     template: require('templates/menu/menu-item.hbs'),
@@ -258,4 +258,4 @@ const MenuItemView = Backbone.View.extend({
     }
 });
 
-module.exports = MenuItemView;
+export { MenuItemView };
diff --git a/app/scripts/views/menu/menu-section-view.js b/app/scripts/views/menu/menu-section-view.js
index f7ce49ad..ea3da560 100644
--- a/app/scripts/views/menu/menu-section-view.js
+++ b/app/scripts/views/menu/menu-section-view.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const MenuItemView = require('./menu-item-view');
-const Resizable = require('../../view-engine/resizable');
-const Scrollable = require('../../view-engine/scrollable');
-const AppSettingsModel = require('../../models/app-settings-model');
+import Backbone from 'backbone';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Resizable } from 'view-engine/resizable';
+import { Scrollable } from 'view-engine/scrollable';
+import { MenuItemView } from 'views/menu/menu-item-view';
 
 const MenuSectionView = Backbone.View.extend({
     template: require('templates/menu/menu-section.hbs'),
@@ -83,4 +83,4 @@ const MenuSectionView = Backbone.View.extend({
 _.extend(MenuSectionView.prototype, Resizable);
 _.extend(MenuSectionView.prototype, Scrollable);
 
-module.exports = MenuSectionView;
+export { MenuSectionView };
diff --git a/app/scripts/views/menu/menu-view.js b/app/scripts/views/menu/menu-view.js
index bf95bea5..07b9f90d 100644
--- a/app/scripts/views/menu/menu-view.js
+++ b/app/scripts/views/menu/menu-view.js
@@ -1,10 +1,10 @@
-const Backbone = require('backbone');
-const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/browser/key-handler');
-const Resizable = require('../../view-engine/resizable');
-const MenuSectionView = require('./menu-section-view');
-const DragView = require('../drag-view');
-const AppSettingsModel = require('../../models/app-settings-model');
+import Backbone from 'backbone';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { Resizable } from 'view-engine/resizable';
+import { DragView } from 'views/drag-view';
+import { MenuSectionView } from 'views/menu/menu-section-view';
 
 const MenuView = Backbone.View.extend({
     template: require('templates/menu/menu.hbs'),
@@ -85,4 +85,4 @@ const MenuView = Backbone.View.extend({
 
 _.extend(MenuView.prototype, Resizable);
 
-module.exports = MenuView;
+export { MenuView };
diff --git a/app/scripts/views/modal-view.js b/app/scripts/views/modal-view.js
index 38ff2aa5..7db1b72e 100644
--- a/app/scripts/views/modal-view.js
+++ b/app/scripts/views/modal-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Keys = require('../const/keys');
-const KeyHandler = require('../comp/browser/key-handler');
+import Backbone from 'backbone';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
 
 const ModalView = Backbone.View.extend({
     el: 'body',
@@ -93,4 +93,4 @@ const ModalView = Backbone.View.extend({
     }
 });
 
-module.exports = ModalView;
+export { ModalView };
diff --git a/app/scripts/views/open-config-view.js b/app/scripts/views/open-config-view.js
index 0edbf194..9a432626 100644
--- a/app/scripts/views/open-config-view.js
+++ b/app/scripts/views/open-config-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Locale = require('../util/locale');
-const Keys = require('../const/keys');
+import Backbone from 'backbone';
+import { Keys } from 'const/keys';
+import { Locale } from 'util/locale';
 
 const OpenConfigView = Backbone.View.extend({
     template: require('templates/open-config.hbs'),
@@ -78,4 +78,4 @@ const OpenConfigView = Backbone.View.extend({
     }
 });
 
-module.exports = OpenConfigView;
+export { OpenConfigView };
diff --git a/app/scripts/views/open-view.js b/app/scripts/views/open-view.js
index 2e8d34c0..c5ad34a4 100644
--- a/app/scripts/views/open-view.js
+++ b/app/scripts/views/open-view.js
@@ -1,21 +1,21 @@
-const Backbone = require('backbone');
-const kdbxweb = require('kdbxweb');
-const OpenConfigView = require('./open-config-view');
-const Keys = require('../const/keys');
-const Alerts = require('../comp/ui/alerts');
-const SecureInput = require('../comp/browser/secure-input');
-const DropboxChooser = require('../comp/app/dropbox-chooser');
-const KeyHandler = require('../comp/browser/key-handler');
-const StorageFileListView = require('../views/storage-file-list-view');
-const Logger = require('../util/logger');
-const Locale = require('../util/locale');
-const UrlFormat = require('../util/formatting/url-format');
-const InputFx = require('../util/ui/input-fx');
-const Comparators = require('../util/data/comparators');
-const Storage = require('../storage');
-const Launcher = require('../comp/launcher');
-const FocusDetector = require('../comp/browser/focus-detector');
-const Features = require('../util/features');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { Storage } from 'storage';
+import { DropboxChooser } from 'comp/app/dropbox-chooser';
+import { FocusDetector } from 'comp/browser/focus-detector';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { SecureInput } from 'comp/browser/secure-input';
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { Keys } from 'const/keys';
+import { Comparators } from 'util/data/comparators';
+import { Features } from 'util/features';
+import { UrlFormat } from 'util/formatting/url-format';
+import { Locale } from 'util/locale';
+import { Logger } from 'util/logger';
+import { InputFx } from 'util/ui/input-fx';
+import { OpenConfigView } from 'views/open-config-view';
+import { StorageFileListView } from 'views/storage-file-list-view';
 
 const logger = new Logger('open-view');
 
@@ -924,4 +924,4 @@ const OpenView = Backbone.View.extend({
     }
 });
 
-module.exports = OpenView;
+export { OpenView };
diff --git a/app/scripts/views/settings/settings-about-view.js b/app/scripts/views/settings/settings-about-view.js
index beaa83dc..42076792 100644
--- a/app/scripts/views/settings/settings-about-view.js
+++ b/app/scripts/views/settings/settings-about-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const RuntimeInfo = require('../../comp/app/runtime-info');
-const Links = require('../../const/links');
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Links } from 'const/links';
 
 const SettingsAboutView = Backbone.View.extend({
     template: require('templates/settings/settings-about.hbs'),
@@ -16,4 +16,4 @@ const SettingsAboutView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsAboutView;
+export { SettingsAboutView };
diff --git a/app/scripts/views/settings/settings-file-view.js b/app/scripts/views/settings/settings-file-view.js
index 9f5dc845..fbc7ba5f 100644
--- a/app/scripts/views/settings/settings-file-view.js
+++ b/app/scripts/views/settings/settings-file-view.js
@@ -1,17 +1,17 @@
-const Backbone = require('backbone');
-const OpenConfigView = require('../open-config-view');
-const Shortcuts = require('../../comp/app/shortcuts');
-const PasswordGenerator = require('../../util/generators/password-generator');
-const Alerts = require('../../comp/ui/alerts');
-const Launcher = require('../../comp/launcher');
-const Storage = require('../../storage');
-const Links = require('../../const/links');
-const DateFormat = require('../../util/formatting/date-format');
-const Locale = require('../../util/locale');
-const UrlFormat = require('../../util/formatting/url-format');
-const FileSaver = require('../../util/ui/file-saver');
-const AppSettingsModel = require('../../models/app-settings-model');
-const kdbxweb = require('kdbxweb');
+import Backbone from 'backbone';
+import kdbxweb from 'kdbxweb';
+import { Storage } from 'storage';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { Launcher } from 'comp/launcher';
+import { Alerts } from 'comp/ui/alerts';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { DateFormat } from 'util/formatting/date-format';
+import { UrlFormat } from 'util/formatting/url-format';
+import { PasswordGenerator } from 'util/generators/password-generator';
+import { Locale } from 'util/locale';
+import { FileSaver } from 'util/ui/file-saver';
+import { OpenConfigView } from 'views/open-config-view';
 
 const DefaultBackupPath = 'Backups/{name}.{date}.bak';
 const DefaultBackupSchedule = '1w';
@@ -678,4 +678,4 @@ const SettingsFileView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsFileView;
+export { SettingsFileView };
diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js
index 1594843d..91104b5b 100644
--- a/app/scripts/views/settings/settings-general-view.js
+++ b/app/scripts/views/settings/settings-general-view.js
@@ -1,20 +1,20 @@
-const Backbone = require('backbone');
-const SettingsPrvView = require('./settings-prv-view');
-const SettingsLogsView = require('./settings-logs-view');
-const Launcher = require('../../comp/launcher');
-const Updater = require('../../comp/app/updater');
-const DateFormat = require('../../util/formatting/date-format');
-const AppSettingsModel = require('../../models/app-settings-model');
-const UpdateModel = require('../../models/update-model');
-const RuntimeInfo = require('../../comp/app/runtime-info');
-const Alerts = require('../../comp/ui/alerts');
-const SettingsManager = require('../../comp/settings/settings-manager');
-const Storage = require('../../storage');
-const Features = require('../../util/features');
-const Locale = require('../../util/locale');
-const SemVer = require('../../util/data/semver');
-const Links = require('../../const/links');
-const AutoType = require('../../auto-type');
+import { AutoType } from 'auto-type';
+import Backbone from 'backbone';
+import { Storage } from 'storage';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Updater } from 'comp/app/updater';
+import { Launcher } from 'comp/launcher';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { Alerts } from 'comp/ui/alerts';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { UpdateModel } from 'models/update-model';
+import { SemVer } from 'util/data/semver';
+import { Features } from 'util/features';
+import { DateFormat } from 'util/formatting/date-format';
+import { Locale } from 'util/locale';
+import { SettingsLogsView } from 'views/settings/settings-logs-view';
+import { SettingsPrvView } from 'views/settings/settings-prv-view';
 
 const SettingsGeneralView = Backbone.View.extend({
     template: require('templates/settings/settings-general.hbs'),
@@ -385,4 +385,4 @@ const SettingsGeneralView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsGeneralView;
+export { SettingsGeneralView };
diff --git a/app/scripts/views/settings/settings-help-view.js b/app/scripts/views/settings/settings-help-view.js
index 5235f155..7fb04960 100644
--- a/app/scripts/views/settings/settings-help-view.js
+++ b/app/scripts/views/settings/settings-help-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const RuntimeInfo = require('../../comp/app/runtime-info');
-const Links = require('../../const/links');
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { Links } from 'const/links';
 
 const SettingsHelpView = Backbone.View.extend({
     template: require('templates/settings/settings-help.hbs'),
@@ -31,4 +31,4 @@ const SettingsHelpView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsHelpView;
+export { SettingsHelpView };
diff --git a/app/scripts/views/settings/settings-logs-view.js b/app/scripts/views/settings/settings-logs-view.js
index 0630ffe1..2a4aa5ff 100644
--- a/app/scripts/views/settings/settings-logs-view.js
+++ b/app/scripts/views/settings/settings-logs-view.js
@@ -1,8 +1,8 @@
-const Backbone = require('backbone');
-const Logger = require('../../util/logger');
-const StringFormat = require('../../util/formatting/string-format');
+import Backbone from 'backbone';
+import { StringFormat } from 'util/formatting/string-format';
+import { Logger } from 'util/logger';
 
-const SettingsLogView = Backbone.View.extend({
+const SettingsLogsView = Backbone.View.extend({
     template: require('templates/settings/settings-logs-view.hbs'),
 
     render() {
@@ -51,4 +51,4 @@ const SettingsLogView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsLogView;
+export { SettingsLogsView };
diff --git a/app/scripts/views/settings/settings-plugins-view.js b/app/scripts/views/settings/settings-plugins-view.js
index 9cc91002..f1bbb012 100644
--- a/app/scripts/views/settings/settings-plugins-view.js
+++ b/app/scripts/views/settings/settings-plugins-view.js
@@ -1,15 +1,15 @@
-const Backbone = require('backbone');
-const Locale = require('../../util/locale');
-const PluginManager = require('../../plugins/plugin-manager');
-const PluginGallery = require('../../plugins/plugin-gallery');
-const AppSettingsModel = require('../../models/app-settings-model');
-const Comparators = require('../../util/data/comparators');
-const DateFormat = require('../../util/formatting/date-format');
-const SettingsManager = require('../../comp/settings/settings-manager');
-const Features = require('../../util/features');
-const SemVer = require('../../util/data/semver');
-const RuntimeInfo = require('../../comp/app/runtime-info');
-const Links = require('../../const/links');
+import Backbone from 'backbone';
+import { RuntimeInfo } from 'comp/app/runtime-info';
+import { SettingsManager } from 'comp/settings/settings-manager';
+import { Links } from 'const/links';
+import { AppSettingsModel } from 'models/app-settings-model';
+import { PluginGallery } from 'plugins/plugin-gallery';
+import { PluginManager } from 'plugins/plugin-manager';
+import { Comparators } from 'util/data/comparators';
+import { SemVer } from 'util/data/semver';
+import { Features } from 'util/features';
+import { DateFormat } from 'util/formatting/date-format';
+import { Locale } from 'util/locale';
 
 const SettingsPluginsView = Backbone.View.extend({
     template: require('templates/settings/settings-plugins.hbs'),
@@ -37,7 +37,7 @@ const SettingsPluginsView = Backbone.View.extend({
     installErrors: {},
 
     initialize() {
-        this.listenTo(PluginManager, 'change', this.render.bind(this));
+        this.listenTo(PluginManager.instance, 'change', this.render.bind(this));
         this.listenTo(
             Backbone,
             'plugin-gallery-load-complete',
@@ -47,7 +47,8 @@ const SettingsPluginsView = Backbone.View.extend({
 
     render() {
         this.renderTemplate({
-            plugins: PluginManager.instance.get('plugins')
+            plugins: PluginManager.instance
+                .get('plugins')
                 .map(plugin => ({
                     id: plugin.id,
                     manifest: plugin.get('manifest'),
@@ -142,7 +143,8 @@ const SettingsPluginsView = Backbone.View.extend({
         urlTextBox.prop('disabled', true);
         installBtn.text(Locale.setPlInstallBtnProgress + '...').prop('disabled', true);
         this.installFromUrl = { url };
-        PluginManager.instance.install(url, undefined, true)
+        PluginManager.instance
+            .install(url, undefined, true)
             .then(() => {
                 this.installFinished();
                 this.installFromUrl = null;
@@ -201,7 +203,8 @@ const SettingsPluginsView = Backbone.View.extend({
         installBtn.text(Locale.setPlInstallBtnProgress + '...').prop('disabled', true);
         this.installing[plugin.url] = true;
         delete this.installErrors[plugin.url];
-        PluginManager.instance.install(plugin.url, plugin.manifest)
+        PluginManager.instance
+            .install(plugin.url, plugin.manifest)
             .catch(e => {
                 this.installErrors[plugin.url] = e;
                 delete this.installing[plugin.url];
@@ -260,4 +263,4 @@ const SettingsPluginsView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsPluginsView;
+export { SettingsPluginsView };
diff --git a/app/scripts/views/settings/settings-prv-view.js b/app/scripts/views/settings/settings-prv-view.js
index d20b7985..b54d9502 100644
--- a/app/scripts/views/settings/settings-prv-view.js
+++ b/app/scripts/views/settings/settings-prv-view.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const Storage = require('../../storage');
+import Backbone from 'backbone';
+import { Storage } from 'storage';
 
 const SettingsPrvView = Backbone.View.extend({
     template: require('templates/settings/settings-prv.hbs'),
@@ -31,4 +31,4 @@ const SettingsPrvView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsPrvView;
+export { SettingsPrvView };
diff --git a/app/scripts/views/settings/settings-shortcuts-view.js b/app/scripts/views/settings/settings-shortcuts-view.js
index 13155b37..ef00aeef 100644
--- a/app/scripts/views/settings/settings-shortcuts-view.js
+++ b/app/scripts/views/settings/settings-shortcuts-view.js
@@ -1,9 +1,9 @@
-const Backbone = require('backbone');
-const Locale = require('../../util/locale');
-const Keys = require('../../const/keys');
-const Launcher = require('../../comp/launcher');
-const Shortcuts = require('../../comp/app/shortcuts');
-const Features = require('../../util/features');
+import Backbone from 'backbone';
+import { Shortcuts } from 'comp/app/shortcuts';
+import { Launcher } from 'comp/launcher';
+import { Keys } from 'const/keys';
+import { Features } from 'util/features';
+import { Locale } from 'util/locale';
 
 const SettingsShortcutsView = Backbone.View.extend({
     template: require('templates/settings/settings-shortcuts.hbs'),
@@ -97,4 +97,4 @@ const SettingsShortcutsView = Backbone.View.extend({
     }
 });
 
-module.exports = SettingsShortcutsView;
+export { SettingsShortcutsView };
diff --git a/app/scripts/views/settings/settings-view.js b/app/scripts/views/settings/settings-view.js
index 6bc4a4c3..f3dcbdeb 100644
--- a/app/scripts/views/settings/settings-view.js
+++ b/app/scripts/views/settings/settings-view.js
@@ -1,7 +1,8 @@
-const Backbone = require('backbone');
-const Scrollable = require('../../view-engine/scrollable');
-const Keys = require('../../const/keys');
-const KeyHandler = require('../../comp/browser/key-handler');
+import Backbone from 'backbone';
+import { KeyHandler } from 'comp/browser/key-handler';
+import { Keys } from 'const/keys';
+import { Scrollable } from 'view-engine/scrollable';
+import { StringFormat } from 'util/formatting/string-format';
 
 const SettingsView = Backbone.View.extend({
     template: require('templates/settings/settings.hbs'),
@@ -36,7 +37,9 @@ const SettingsView = Backbone.View.extend({
     },
 
     setPage(e) {
-        const SettingsPageView = require('./settings-' + e.page + '-view');
+        const module = require('./settings-' + e.page + '-view');
+        const viewName = StringFormat.capFirst(e.page);
+        const SettingsPageView = module[`Settings${viewName}View`];
         if (this.views.page) {
             this.views.page.remove();
         }
@@ -55,4 +58,4 @@ const SettingsView = Backbone.View.extend({
 
 _.extend(SettingsView.prototype, Scrollable);
 
-module.exports = SettingsView;
+export { SettingsView };
diff --git a/app/scripts/views/storage-file-list-view.js b/app/scripts/views/storage-file-list-view.js
index bdfe7697..8b209a70 100644
--- a/app/scripts/views/storage-file-list-view.js
+++ b/app/scripts/views/storage-file-list-view.js
@@ -1,5 +1,5 @@
-const Backbone = require('backbone');
-const UrlFormat = require('../util/formatting/url-format');
+import Backbone from 'backbone';
+import { UrlFormat } from 'util/formatting/url-format';
 
 const StorageFileListView = Backbone.View.extend({
     template: require('templates/storage-file-list.hbs'),
@@ -58,4 +58,4 @@ const StorageFileListView = Backbone.View.extend({
     }
 });
 
-module.exports = StorageFileListView;
+export { StorageFileListView };
diff --git a/app/scripts/views/tag-view.js b/app/scripts/views/tag-view.js
index 54f30ad6..a0fc2248 100644
--- a/app/scripts/views/tag-view.js
+++ b/app/scripts/views/tag-view.js
@@ -1,6 +1,6 @@
-const Backbone = require('backbone');
-const Locale = require('../util/locale');
-const Alerts = require('../comp/ui/alerts');
+import Backbone from 'backbone';
+import { Alerts } from 'comp/ui/alerts';
+import { Locale } from 'util/locale';
 
 const TagView = Backbone.View.extend({
     template: require('templates/tag.hbs'),
@@ -69,4 +69,4 @@ const TagView = Backbone.View.extend({
     }
 });
 
-module.exports = TagView;
+export { TagView };
diff --git a/util/import.js b/util/import.js
deleted file mode 100644
index 52912b15..00000000
--- a/util/import.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* eslint-disable no-console */
-
-const fs = require('fs');
-const path = require('path');
-
-const readdirSync = (p, a = []) => {
-    if (fs.statSync(p).isDirectory()) {
-        fs.readdirSync(p).map(f => readdirSync(a[a.push(path.join(p, f)) - 1], a));
-    }
-    return a;
-};
-
-console.log('Building file list...');
-
-const files = readdirSync('app/scripts').filter(f => f.endsWith('.js'));
-
-console.log(`Found ${files.length} files, working...`);
-
-for (const file of files) {
-    const lines = fs.readFileSync(file, 'utf8').split('\n');
-    const imports = [];
-    for (let ix = 0; ix < lines.length; ix++) {
-        const match = lines[ix].match(/^const\s+(\w+)\s*=\s*require\('(.*)'\);$/);
-        if (!match) {
-            break;
-        }
-        let [, variable, modPath] = match;
-        if (modPath.includes('/')) {
-            modPath = path.join(path.dirname(file), modPath).replace('app/scripts/', '');
-        }
-        imports.push({
-            variable,
-            modPath
-        });
-    }
-    imports.sort((a, b) => {
-        const aModPath = a.modPath.includes('/') ? a.modPath : `_${a.modPath}`;
-        const bModPath = b.modPath.includes('/') ? b.modPath : `_${b.modPath}`;
-        return aModPath.localeCompare(bModPath);
-    });
-    for (let ix = 0; ix < imports.length; ix++) {
-        const imp = imports[ix];
-        lines[ix] = `import { ${imp.variable} } from '${imp.modPath}';`;
-    }
-
-    for (let ix = 0; ix < lines.length; ix++) {
-        const match = lines[ix].match(/^module\.exports/);
-        if (!match) {
-            continue;
-        }
-        const simpleExportMatch = lines[ix].match(/^module.exports\s*=\s*(\w+);/);
-        if (simpleExportMatch) {
-            const varName = simpleExportMatch[1];
-            lines[ix] = `export { ${varName} };`;
-            continue;
-        }
-        console.log(lines[ix]);
-    }
-    // fs.writeFileSync(file, lines.join('\n'));
-}
-
-console.log('Done');