diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index 3b9298c92d9..637024d50e5 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -420,18 +420,19 @@ export default class MainBackground {
             return;
         }
 
+        const self = this;
         const tab = await this.tabsQueryFirst({ active: true, windowId: chrome.windows.WINDOW_ID_CURRENT });
         if (!tab) {
             return;
         }
 
-        const disabled = await this.utilsService.getObjFromStorage<boolean>(ConstantsService.disableContextMenuItemKey);
+        const disabled = await self.utilsService.getObjFromStorage<boolean>(ConstantsService.disableContextMenuItemKey);
         if (!disabled) {
             await this.buildContextMenu();
             this.contextMenuReady(tab, true);
         } else {
             await this.contextMenusRemoveAll();
-            this.contextMenuReady(tab, false);
+            self.contextMenuReady(tab, false);
         }
     }
 
diff --git a/src/popup/app/components/action-buttons.component.ts b/src/popup/app/components/action-buttons.component.ts
index 552f0a8b79c..a04ff170f6e 100644
--- a/src/popup/app/components/action-buttons.component.ts
+++ b/src/popup/app/components/action-buttons.component.ts
@@ -47,5 +47,5 @@ export const ActionButtonsComponent = {
         onView: '&',
     },
     controller: ActionButtonsController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/components/cipher-items.component.ts b/src/popup/app/components/cipher-items.component.ts
index 93b5da03c35..c6387c0a265 100644
--- a/src/popup/app/components/cipher-items.component.ts
+++ b/src/popup/app/components/cipher-items.component.ts
@@ -11,11 +11,11 @@ export class CipherItemsController implements ng.IController {
     }
 
     view(cipher: any) {
-        return this.onView({cipher});
+        return this.onView({ cipher: cipher });
     }
 
     select(cipher: any) {
-        return this.onSelected({cipher});
+        return this.onSelected({ cipher: cipher });
     }
 }
 
@@ -27,5 +27,5 @@ export const CipherItemsComponent = {
         onView: '&',
     },
     controller: CipherItemsController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/components/icon.component.ts b/src/popup/app/components/icon.component.ts
index 9d129564ba5..de3c0dc8770 100644
--- a/src/popup/app/components/icon.component.ts
+++ b/src/popup/app/components/icon.component.ts
@@ -78,5 +78,5 @@ export const IconComponent = {
         cipher: '<',
     },
     controller: IconController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/components/pop-out.component.ts b/src/popup/app/components/pop-out.component.ts
index 3ba85bf66fe..5af16e16913 100644
--- a/src/popup/app/components/pop-out.component.ts
+++ b/src/popup/app/components/pop-out.component.ts
@@ -56,5 +56,5 @@ export class PopOutController implements ng.IController {
 export const PopOutComponent = {
     bindings: {},
     controller: PopOutController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/current/current.component.ts b/src/popup/app/current/current.component.ts
index 6cbf384cecb..78284ae4553 100644
--- a/src/popup/app/current/current.component.ts
+++ b/src/popup/app/current/current.component.ts
@@ -69,7 +69,7 @@ export class CurrentController {
         }
 
         this.autofillService.doAutoFill({
-            cipher,
+            cipher: cipher,
             pageDetails: this.pageDetails,
             fromBackground: false,
         }).then((totpCode: string) => {
@@ -165,5 +165,5 @@ export class CurrentController {
 export const CurrentComponent = {
     bindings: {},
     controller: CurrentController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/lock/lock.component.ts b/src/popup/app/lock/lock.component.ts
index 244386f6a54..50b40472202 100644
--- a/src/popup/app/lock/lock.component.ts
+++ b/src/popup/app/lock/lock.component.ts
@@ -59,5 +59,5 @@ export class LockController {
 export const LockComponent = {
     bindings: {},
     controller: LockController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/about.component.ts b/src/popup/app/settings/about.component.ts
index a8e2f0d2c9a..9098e40a127 100644
--- a/src/popup/app/settings/about.component.ts
+++ b/src/popup/app/settings/about.component.ts
@@ -15,5 +15,5 @@ export class AboutController {
 export const AboutComponent = {
     bindings: {},
     controller: AboutController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/credits.component.ts b/src/popup/app/settings/credits.component.ts
index 36f27e73f0d..aab107787c1 100644
--- a/src/popup/app/settings/credits.component.ts
+++ b/src/popup/app/settings/credits.component.ts
@@ -19,5 +19,5 @@ export class CreditsController {
 export const CreditsComponent = {
     bindings: {},
     controller: CreditsController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/environment.component.ts b/src/popup/app/settings/environment.component.ts
index 9cdaccf819c..be886e5863d 100644
--- a/src/popup/app/settings/environment.component.ts
+++ b/src/popup/app/settings/environment.component.ts
@@ -51,5 +51,5 @@ export class EnvironmentController {
 export const EnvironmentComponent = {
     bindings: {},
     controller: EnvironmentController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/folders/add-folder.component.ts b/src/popup/app/settings/folders/add-folder.component.ts
index d7678865ee5..14382d181d1 100644
--- a/src/popup/app/settings/folders/add-folder.component.ts
+++ b/src/popup/app/settings/folders/add-folder.component.ts
@@ -40,5 +40,5 @@ export class AddFolderController {
 export const AddFolderComponent = {
     bindings: {},
     controller: AddFolderController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/folders/edit-folder.component.ts b/src/popup/app/settings/folders/edit-folder.component.ts
index 9235fdb7577..f923a99cb3d 100644
--- a/src/popup/app/settings/folders/edit-folder.component.ts
+++ b/src/popup/app/settings/folders/edit-folder.component.ts
@@ -74,5 +74,5 @@ export const EditFolderComponent = {
         $transition$: '<',
     },
     controller: EditFolderController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/folders/folders.component.ts b/src/popup/app/settings/folders/folders.component.ts
index ea7aeba8ce7..cc7d045abb1 100644
--- a/src/popup/app/settings/folders/folders.component.ts
+++ b/src/popup/app/settings/folders/folders.component.ts
@@ -35,5 +35,5 @@ export class FoldersController {
 export const FoldersComponent = {
     bindings: {},
     controller: FoldersController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/help.component.ts b/src/popup/app/settings/help.component.ts
index 2b55547b247..51794fb22e5 100644
--- a/src/popup/app/settings/help.component.ts
+++ b/src/popup/app/settings/help.component.ts
@@ -31,5 +31,5 @@ export class HelpController {
 export const HelpComponent = {
     bindings: {},
     controller: HelpController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/options.component.ts b/src/popup/app/settings/options.component.ts
index 193153c6995..e09614f0b70 100644
--- a/src/popup/app/settings/options.component.ts
+++ b/src/popup/app/settings/options.component.ts
@@ -91,5 +91,5 @@ export class OptionsController {
 export const OptionsComponent = {
     bindings: {},
     controller: OptionsController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/premium.component.ts b/src/popup/app/settings/premium.component.ts
index e4b4c345f50..94e2da4adbf 100644
--- a/src/popup/app/settings/premium.component.ts
+++ b/src/popup/app/settings/premium.component.ts
@@ -56,5 +56,5 @@ export class PremiumController {
 export const PremiumComponent = {
     bindings: {},
     controller: PremiumController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/settings.component.ts b/src/popup/app/settings/settings.component.ts
index 7fd8e993949..103c7a69943 100644
--- a/src/popup/app/settings/settings.component.ts
+++ b/src/popup/app/settings/settings.component.ts
@@ -148,5 +148,5 @@ export class SettingsController {
 export const SettingsComponent = {
     bindings: {},
     controller: SettingsController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/settings/sync.component.ts b/src/popup/app/settings/sync.component.ts
index 6a642d933ca..3e71d6d2115 100644
--- a/src/popup/app/settings/sync.component.ts
+++ b/src/popup/app/settings/sync.component.ts
@@ -38,5 +38,5 @@ export class SyncController {
 export const SyncComponent = {
     bindings: {},
     controller: SyncController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/tools/export.component.ts b/src/popup/app/tools/export.component.ts
index 4663a3ba8f4..0fa9f631455 100644
--- a/src/popup/app/tools/export.component.ts
+++ b/src/popup/app/tools/export.component.ts
@@ -166,5 +166,5 @@ export class ExportController {
 export const ExportComponent = {
     bindings: {},
     controller: ExportController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/tools/password-generator-history.component.ts b/src/popup/app/tools/password-generator-history.component.ts
index f99c2b39ec6..0bc4bc1c7d3 100644
--- a/src/popup/app/tools/password-generator-history.component.ts
+++ b/src/popup/app/tools/password-generator-history.component.ts
@@ -50,5 +50,5 @@ export const PasswordGeneratorHistoryComponent = {
         $transition$: '<',
     },
     controller: PasswordGeneratorHistoryController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/tools/password-generator.component.ts b/src/popup/app/tools/password-generator.component.ts
index 0727f541924..fcccbee4aa2 100644
--- a/src/popup/app/tools/password-generator.component.ts
+++ b/src/popup/app/tools/password-generator.component.ts
@@ -140,5 +140,5 @@ export const PasswordGeneratorComponent = {
         $transition$: '<',
     },
     controller: PasswordGeneratorController,
-    template,
+    template: template,
 };
diff --git a/src/popup/app/tools/tools.component.ts b/src/popup/app/tools/tools.component.ts
index 7f55134f38d..900c3170c98 100644
--- a/src/popup/app/tools/tools.component.ts
+++ b/src/popup/app/tools/tools.component.ts
@@ -56,5 +56,5 @@ export class ToolsController {
 export const ToolsComponent = {
     bindings: {},
     controller: ToolsController,
-    template,
+    template: template,
 };
diff --git a/src/services/i18n.service.ts b/src/services/i18n.service.ts
index 19747d4ae4d..a294015f3c1 100644
--- a/src/services/i18n.service.ts
+++ b/src/services/i18n.service.ts
@@ -18,10 +18,10 @@ export default function i18nService(utilsService: UtilsService) {
     }
 
     return new Proxy({}, {
-        get(target, name) {
+        get: (target, name) => {
             return chrome.i18n.getMessage(name);
         },
-        set(target, name, value) {
+        set: (target, name, value) => {
             return false;
         },
     });
diff --git a/tslint.json b/tslint.json
index c58665a8ca2..b6d5571669c 100644
--- a/tslint.json
+++ b/tslint.json
@@ -36,6 +36,7 @@
     ],
     "no-empty": [ true, "allow-empty-catch" ],
     "object-literal-sort-keys": false,
+    "object-literal-shorthand": [ true, "never" ],
     "prefer-for-of": false,
     "quotemark": [ true, "single" ],
     "whitespace": [